mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Merge m-c to inbound, a=merge
This commit is contained in:
Wes Kocher
commit
a183d75efd
@ -15,7 +15,7 @@
|
||||
<project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
</project>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
|
||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
@ -137,14 +137,14 @@
|
||||
<project name="platform_frameworks_base" path="frameworks/base" remote="b2g" revision="04e26ebdc36ca83f4ee3e9e2082b3fcf04c5b971"/>
|
||||
<project name="platform_frameworks_wilhelm" path="frameworks/wilhelm" remote="b2g" revision="0dbf5baafadf6d233c0a29e392fa3293f0121673"/>
|
||||
<project name="platform_system_core" path="system/core" remote="b2g" revision="f594bc64eacac490857748b1139ffcb34c856bbd"/>
|
||||
<project name="platform_external_sepolicy" path="external/sepolicy" remote="b2g" revision="3f6be48a46c54dd8cacaf216ab5b145de5ffefd2"/>
|
||||
<default remote="caf" revision="refs/tags/android-5.1.0_r1" sync-j="4"/>
|
||||
<!-- Emulator specific things -->
|
||||
<project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="fe7df1bc8dd0fd71571505d7be1c31a4ad1e40fb"/>
|
||||
<project name="device_generic_goldfish" path="device/generic/goldfish" remote="b2g" revision="48132ec0b0dfe9fc29c7c3f0e799066be8999198"/>
|
||||
<project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="59e434cbecc02653f44cedeb2ef5cc88dc8bb61b"/>
|
||||
<project name="platform_external_sepolicy" path="external/sepolicy" remote="b2g" revision="3f6be48a46c54dd8cacaf216ab5b145de5ffefd2"/>
|
||||
<project name="platform_external_wpa_supplicant_8" path="external/wpa_supplicant_8" remote="b2g" revision="cbda29a58abc4ea1f7f4611fe354ab67b606219d"/>
|
||||
<project name="platform/development" path="development" revision="0c51f6e0aa2ee57fcb75ec3b2ff6bf754cece63e"/>
|
||||
<project name="android-sdk" path="sdk" remote="b2g" revision="ff4190dc603f62a7caa48342aa268acf99863c5c"/>
|
||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2210a0276fa000ef7224f26b24f00cb34a372e8d"/>
|
||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="10d289639ea62f2f6fcfb5bbf6121c484e95f767"/>
|
||||
</manifest>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
|
||||
<project name="gaia.git" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||
<project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="2d58f4b9206b50b8fda0d5036da6f0c62608db7c"/>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<project name="platform_build" path="build" remote="b2g" revision="e862ab9177af664f00b4522e2350f4cb13866d73">
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"git": {
|
||||
"git_revision": "581de383687dc441a878d2c91a0167c6ec688fef",
|
||||
"git_revision": "4ede0c6bf5fb0c2896d5393032b395999a154619",
|
||||
"remote": "https://git.mozilla.org/releases/gaia.git",
|
||||
"branch": ""
|
||||
},
|
||||
"revision": "a0015e0f59bdec57f732c805238172bd49406ab5",
|
||||
"revision": "8c8613183a6efdbb9172b2c27ae1e60290398d45",
|
||||
"repo_path": "integration/gaia-central"
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
</project>
|
||||
<project name="rilproxy" path="rilproxy" remote="b2g" revision="5ef30994f4778b4052e58a4383dbe7890048c87e"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="657894b4a1dc0a926117f4812e0940229f9f676f"/>
|
||||
<project name="apitrace" path="external/apitrace" remote="apitrace" revision="6ddfd98cdafefaa1b60273d5568b8dbd13730dae"/>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
<project name="platform_build" path="build" remote="b2g" revision="07c383a786f188904311a37f6062c2cb84c9b61d">
|
||||
<copyfile dest="Makefile" src="core/root.mk"/>
|
||||
</project>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="581de383687dc441a878d2c91a0167c6ec688fef"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="4ede0c6bf5fb0c2896d5393032b395999a154619"/>
|
||||
<project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4d9fbc08e87731447c19e96e13d8c7444baafcca"/>
|
||||
<project name="librecovery" path="librecovery" remote="b2g" revision="1b3591a50ed352fc6ddb77462b7b35d0bfa555a3"/>
|
||||
@ -137,12 +137,12 @@
|
||||
<project name="platform_frameworks_base" path="frameworks/base" remote="b2g" revision="04e26ebdc36ca83f4ee3e9e2082b3fcf04c5b971"/>
|
||||
<project name="platform_frameworks_wilhelm" path="frameworks/wilhelm" remote="b2g" revision="0dbf5baafadf6d233c0a29e392fa3293f0121673"/>
|
||||
<project name="platform_system_core" path="system/core" remote="b2g" revision="f594bc64eacac490857748b1139ffcb34c856bbd"/>
|
||||
<project name="platform_external_sepolicy" path="external/sepolicy" remote="b2g" revision="3f6be48a46c54dd8cacaf216ab5b145de5ffefd2"/>
|
||||
<default remote="caf" revision="refs/tags/android-5.1.0_r1" sync-j="4"/>
|
||||
<!-- Nexus 5 specific things -->
|
||||
<project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="fe7df1bc8dd0fd71571505d7be1c31a4ad1e40fb"/>
|
||||
<project name="device-hammerhead" path="device/lge/hammerhead" remote="b2g" revision="e728bf3ff61dfab1b97c2416096a3b850b47cf25"/>
|
||||
<project name="device_lge_hammerhead-kernel" path="device/lge/hammerhead-kernel" remote="b2g" revision="8b3ffcfdd3d3852eca5488628f8bb2a08acbffa7"/>
|
||||
<project name="platform_external_sepolicy" path="external/sepolicy" remote="b2g" revision="3f6be48a46c54dd8cacaf216ab5b145de5ffefd2"/>
|
||||
<project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="5d0ae53d9588c3d70c005aec9be94af9a534de16"/>
|
||||
<project name="platform/external/wpa_supplicant_8" path="external/wpa_supplicant_8" revision="c15b6e266136cd0cdd9b94d0bbed1962d9dd6672"/>
|
||||
<project name="platform/hardware/broadcom/libbt" path="hardware/broadcom/libbt" revision="399fe3d3c8f38c599a56becddc456133e62a5d70"/>
|
||||
|
||||
@ -1709,8 +1709,6 @@ pref("image.mem.max_decoded_image_kb", 256000);
|
||||
pref("loop.enabled", true);
|
||||
pref("loop.textChat.enabled", true);
|
||||
pref("loop.server", "https://loop.services.mozilla.com/v0");
|
||||
pref("loop.seenToS", "unseen");
|
||||
pref("loop.showPartnerLogo", true);
|
||||
pref("loop.gettingStarted.seen", false);
|
||||
pref("loop.gettingStarted.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/hello/start/");
|
||||
pref("loop.gettingStarted.resumeOnFirstJoin", false);
|
||||
|
||||
@ -563,8 +563,20 @@
|
||||
<parameter name="aTab"/>
|
||||
<parameter name="aBrowser"/>
|
||||
<parameter name="aStartsBlank"/>
|
||||
<parameter name="aWasPreloadedBrowser"/>
|
||||
<body>
|
||||
<![CDATA[
|
||||
let stateFlags = 0;
|
||||
// Initialize mStateFlags to non-zero e.g. when creating a progress
|
||||
// listener for preloaded browsers as there was no progress listener
|
||||
// around when the content started loading. If the content didn't
|
||||
// quite finish loading yet, mStateFlags will very soon be overridden
|
||||
// with the correct value and end up at STATE_STOP again.
|
||||
if (aWasPreloadedBrowser) {
|
||||
stateFlags = Ci.nsIWebProgressListener.STATE_STOP |
|
||||
Ci.nsIWebProgressListener.STATE_IS_REQUEST;
|
||||
}
|
||||
|
||||
return ({
|
||||
mTabBrowser: this,
|
||||
mTab: aTab,
|
||||
@ -572,7 +584,7 @@
|
||||
mBlank: aStartsBlank,
|
||||
|
||||
// cache flags for correct status UI update after tab switching
|
||||
mStateFlags: 0,
|
||||
mStateFlags: stateFlags,
|
||||
mStatus: 0,
|
||||
mMessage: "",
|
||||
mTotalProgress: 0,
|
||||
@ -1847,7 +1859,7 @@
|
||||
this.tabContainer.updateVisibility();
|
||||
|
||||
// wire up a progress listener for the new browser object.
|
||||
var tabListener = this.mTabProgressListener(t, b, uriIsAboutBlank);
|
||||
var tabListener = this.mTabProgressListener(t, b, uriIsAboutBlank, usingPreloadedContent);
|
||||
const filter = Components.classes["@mozilla.org/appshell/component/browser-status-filter;1"]
|
||||
.createInstance(Components.interfaces.nsIWebProgress);
|
||||
filter.addProgressListener(tabListener, Components.interfaces.nsIWebProgress.NOTIFY_ALL);
|
||||
@ -2573,7 +2585,7 @@
|
||||
|
||||
// Restore the progress listener
|
||||
this.mTabListeners[index] = tabListener =
|
||||
this.mTabProgressListener(aOurTab, ourBrowser, false);
|
||||
this.mTabProgressListener(aOurTab, ourBrowser, false, false);
|
||||
|
||||
const notifyAll = Ci.nsIWebProgress.NOTIFY_ALL;
|
||||
filter.addProgressListener(tabListener, notifyAll);
|
||||
@ -4052,7 +4064,7 @@
|
||||
this.updateWindowResizers();
|
||||
|
||||
// Hook up the event listeners to the first browser
|
||||
var tabListener = this.mTabProgressListener(this.mCurrentTab, this.mCurrentBrowser, true);
|
||||
var tabListener = this.mTabProgressListener(this.mCurrentTab, this.mCurrentBrowser, true, false);
|
||||
const nsIWebProgress = Components.interfaces.nsIWebProgress;
|
||||
const filter = Components.classes["@mozilla.org/appshell/component/browser-status-filter;1"]
|
||||
.createInstance(nsIWebProgress);
|
||||
|
||||
@ -263,16 +263,6 @@ loop.panel = (function(_, mozL10n) {
|
||||
var ToSView = React.createClass({displayName: "ToSView",
|
||||
mixins: [sharedMixins.WindowCloseMixin],
|
||||
|
||||
getInitialState: function() {
|
||||
var getPref = navigator.mozLoop.getLoopPref.bind(navigator.mozLoop);
|
||||
|
||||
return {
|
||||
seenToS: getPref("seenToS"),
|
||||
gettingStartedSeen: getPref("gettingStarted.seen"),
|
||||
showPartnerLogo: getPref("showPartnerLogo")
|
||||
};
|
||||
},
|
||||
|
||||
handleLinkClick: function(event) {
|
||||
if (!event.target || !event.target.href) {
|
||||
return;
|
||||
@ -283,50 +273,35 @@ loop.panel = (function(_, mozL10n) {
|
||||
this.closeWindow();
|
||||
},
|
||||
|
||||
renderPartnerLogo: function() {
|
||||
if (!this.state.showPartnerLogo) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var locale = mozL10n.getLanguage();
|
||||
navigator.mozLoop.setLoopPref("showPartnerLogo", false);
|
||||
return (
|
||||
React.createElement("p", {className: "powered-by", id: "powered-by"},
|
||||
mozL10n.get("powered_by_beforeLogo"),
|
||||
React.createElement("img", {className: locale, id: "powered-by-logo"}),
|
||||
mozL10n.get("powered_by_afterLogo")
|
||||
)
|
||||
);
|
||||
},
|
||||
|
||||
render: function() {
|
||||
if (!this.state.gettingStartedSeen || this.state.seenToS == "unseen") {
|
||||
var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url");
|
||||
var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url");
|
||||
var tosHTML = mozL10n.get("legal_text_and_links3", {
|
||||
"clientShortname": mozL10n.get("clientShortname2"),
|
||||
"terms_of_use": React.renderToStaticMarkup(
|
||||
React.createElement("a", {href: terms_of_use_url, target: "_blank"},
|
||||
mozL10n.get("legal_text_tos")
|
||||
)
|
||||
),
|
||||
"privacy_notice": React.renderToStaticMarkup(
|
||||
React.createElement("a", {href: privacy_notice_url, target: "_blank"},
|
||||
mozL10n.get("legal_text_privacy")
|
||||
)
|
||||
var locale = mozL10n.getLanguage();
|
||||
var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url");
|
||||
var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url");
|
||||
var tosHTML = mozL10n.get("legal_text_and_links3", {
|
||||
"clientShortname": mozL10n.get("clientShortname2"),
|
||||
"terms_of_use": React.renderToStaticMarkup(
|
||||
React.createElement("a", {href: terms_of_use_url, target: "_blank"},
|
||||
mozL10n.get("legal_text_tos")
|
||||
)
|
||||
});
|
||||
return (
|
||||
React.createElement("div", {id: "powered-by-wrapper"},
|
||||
this.renderPartnerLogo(),
|
||||
React.createElement("p", {className: "terms-service",
|
||||
dangerouslySetInnerHTML: {__html: tosHTML},
|
||||
onClick: this.handleLinkClick})
|
||||
)
|
||||
);
|
||||
} else {
|
||||
return React.createElement("div", null);
|
||||
}
|
||||
),
|
||||
"privacy_notice": React.renderToStaticMarkup(
|
||||
React.createElement("a", {href: privacy_notice_url, target: "_blank"},
|
||||
mozL10n.get("legal_text_privacy")
|
||||
)
|
||||
)
|
||||
});
|
||||
return (
|
||||
React.createElement("div", {id: "powered-by-wrapper"},
|
||||
React.createElement("p", {className: "powered-by", id: "powered-by"},
|
||||
mozL10n.get("powered_by_beforeLogo"),
|
||||
React.createElement("img", {className: locale, id: "powered-by-logo"}),
|
||||
mozL10n.get("powered_by_afterLogo")
|
||||
),
|
||||
React.createElement("p", {className: "terms-service",
|
||||
dangerouslySetInnerHTML: {__html: tosHTML},
|
||||
onClick: this.handleLinkClick})
|
||||
)
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
@ -969,8 +944,7 @@ loop.panel = (function(_, mozL10n) {
|
||||
React.createElement(RoomList, {dispatcher: this.props.dispatcher,
|
||||
mozLoop: this.props.mozLoop,
|
||||
store: this.props.roomStore,
|
||||
userProfile: this.state.userProfile}),
|
||||
React.createElement(ToSView, null)
|
||||
userProfile: this.state.userProfile})
|
||||
),
|
||||
React.createElement(Tab, {name: "contacts"},
|
||||
React.createElement(ContactsList, {
|
||||
|
||||
@ -263,16 +263,6 @@ loop.panel = (function(_, mozL10n) {
|
||||
var ToSView = React.createClass({
|
||||
mixins: [sharedMixins.WindowCloseMixin],
|
||||
|
||||
getInitialState: function() {
|
||||
var getPref = navigator.mozLoop.getLoopPref.bind(navigator.mozLoop);
|
||||
|
||||
return {
|
||||
seenToS: getPref("seenToS"),
|
||||
gettingStartedSeen: getPref("gettingStarted.seen"),
|
||||
showPartnerLogo: getPref("showPartnerLogo")
|
||||
};
|
||||
},
|
||||
|
||||
handleLinkClick: function(event) {
|
||||
if (!event.target || !event.target.href) {
|
||||
return;
|
||||
@ -283,50 +273,35 @@ loop.panel = (function(_, mozL10n) {
|
||||
this.closeWindow();
|
||||
},
|
||||
|
||||
renderPartnerLogo: function() {
|
||||
if (!this.state.showPartnerLogo) {
|
||||
return null;
|
||||
}
|
||||
|
||||
var locale = mozL10n.getLanguage();
|
||||
navigator.mozLoop.setLoopPref("showPartnerLogo", false);
|
||||
return (
|
||||
<p className="powered-by" id="powered-by">
|
||||
{mozL10n.get("powered_by_beforeLogo")}
|
||||
<img className={locale} id="powered-by-logo" />
|
||||
{mozL10n.get("powered_by_afterLogo")}
|
||||
</p>
|
||||
);
|
||||
},
|
||||
|
||||
render: function() {
|
||||
if (!this.state.gettingStartedSeen || this.state.seenToS == "unseen") {
|
||||
var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url");
|
||||
var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url");
|
||||
var tosHTML = mozL10n.get("legal_text_and_links3", {
|
||||
"clientShortname": mozL10n.get("clientShortname2"),
|
||||
"terms_of_use": React.renderToStaticMarkup(
|
||||
<a href={terms_of_use_url} target="_blank">
|
||||
{mozL10n.get("legal_text_tos")}
|
||||
</a>
|
||||
),
|
||||
"privacy_notice": React.renderToStaticMarkup(
|
||||
<a href={privacy_notice_url} target="_blank">
|
||||
{mozL10n.get("legal_text_privacy")}
|
||||
</a>
|
||||
)
|
||||
});
|
||||
return (
|
||||
<div id="powered-by-wrapper">
|
||||
{this.renderPartnerLogo()}
|
||||
<p className="terms-service"
|
||||
dangerouslySetInnerHTML={{__html: tosHTML}}
|
||||
onClick={this.handleLinkClick}></p>
|
||||
</div>
|
||||
);
|
||||
} else {
|
||||
return <div />;
|
||||
}
|
||||
var locale = mozL10n.getLanguage();
|
||||
var terms_of_use_url = navigator.mozLoop.getLoopPref("legal.ToS_url");
|
||||
var privacy_notice_url = navigator.mozLoop.getLoopPref("legal.privacy_url");
|
||||
var tosHTML = mozL10n.get("legal_text_and_links3", {
|
||||
"clientShortname": mozL10n.get("clientShortname2"),
|
||||
"terms_of_use": React.renderToStaticMarkup(
|
||||
<a href={terms_of_use_url} target="_blank">
|
||||
{mozL10n.get("legal_text_tos")}
|
||||
</a>
|
||||
),
|
||||
"privacy_notice": React.renderToStaticMarkup(
|
||||
<a href={privacy_notice_url} target="_blank">
|
||||
{mozL10n.get("legal_text_privacy")}
|
||||
</a>
|
||||
)
|
||||
});
|
||||
return (
|
||||
<div id="powered-by-wrapper">
|
||||
<p className="powered-by" id="powered-by">
|
||||
{mozL10n.get("powered_by_beforeLogo")}
|
||||
<img className={locale} id="powered-by-logo" />
|
||||
{mozL10n.get("powered_by_afterLogo")}
|
||||
</p>
|
||||
<p className="terms-service"
|
||||
dangerouslySetInnerHTML={{__html: tosHTML}}
|
||||
onClick={this.handleLinkClick}></p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
@ -970,7 +945,6 @@ loop.panel = (function(_, mozL10n) {
|
||||
mozLoop={this.props.mozLoop}
|
||||
store={this.props.roomStore}
|
||||
userProfile={this.state.userProfile} />
|
||||
<ToSView />
|
||||
</Tab>
|
||||
<Tab name="contacts">
|
||||
<ContactsList
|
||||
|
||||
@ -370,16 +370,11 @@ loop.store = loop.store || {};
|
||||
|
||||
switch (providerOrigin) {
|
||||
case "mail.google.com":
|
||||
shareTitle = mozL10n.get("share_email_subject5", {
|
||||
clientShortname2: mozL10n.get("clientShortname2")
|
||||
});
|
||||
shareBody = mozL10n.get("share_email_body5", {
|
||||
callUrl: actionData.roomUrl,
|
||||
brandShortname: mozL10n.get("brandShortname"),
|
||||
clientShortname2: mozL10n.get("clientShortname2"),
|
||||
clientSuperShortname: mozL10n.get("clientSuperShortname"),
|
||||
learnMoreUrl: this._mozLoop.getLoopPref("learnMoreUrl")
|
||||
shareTitle = mozL10n.get("share_email_subject6");
|
||||
shareBody = mozL10n.get("share_email_body6", {
|
||||
callUrl: actionData.roomUrl
|
||||
});
|
||||
shareBody += mozL10n.get("share_email_footer");
|
||||
break;
|
||||
case "twitter.com":
|
||||
default:
|
||||
|
||||
@ -762,9 +762,6 @@ loop.store.ActiveRoomStore = (function() {
|
||||
roomState: ROOM_STATES.HAS_PARTICIPANTS,
|
||||
used: true
|
||||
});
|
||||
|
||||
// We've connected with a third-party, therefore stop displaying the ToS etc.
|
||||
this._mozLoop.setLoopPref("seenToS", "seen");
|
||||
},
|
||||
|
||||
/**
|
||||
|
||||
@ -398,40 +398,25 @@ var inChrome = typeof Components != "undefined" && "utils" in Components;
|
||||
}
|
||||
|
||||
var subject, body;
|
||||
var brandShortname = mozL10n.get("brandShortname");
|
||||
var clientShortname2 = mozL10n.get("clientShortname2");
|
||||
var clientSuperShortname = mozL10n.get("clientSuperShortname");
|
||||
var learnMoreUrl = mozLoop.getLoopPref("learnMoreUrl");
|
||||
var footer = mozL10n.get("share_email_footer");
|
||||
|
||||
if (contextDescription) {
|
||||
subject = mozL10n.get("share_email_subject_context", {
|
||||
clientShortname2: clientShortname2,
|
||||
title: contextDescription
|
||||
});
|
||||
body = mozL10n.get("share_email_body_context", {
|
||||
subject = mozL10n.get("share_email_subject6");
|
||||
body = mozL10n.get("share_email_body_context2", {
|
||||
callUrl: callUrl,
|
||||
brandShortname: brandShortname,
|
||||
clientShortname2: clientShortname2,
|
||||
clientSuperShortname: clientSuperShortname,
|
||||
learnMoreUrl: learnMoreUrl,
|
||||
title: contextDescription
|
||||
});
|
||||
} else {
|
||||
subject = mozL10n.get("share_email_subject5", {
|
||||
clientShortname2: clientShortname2
|
||||
});
|
||||
body = mozL10n.get("share_email_body5", {
|
||||
callUrl: callUrl,
|
||||
brandShortname: brandShortname,
|
||||
clientShortname2: clientShortname2,
|
||||
clientSuperShortname: clientSuperShortname,
|
||||
learnMoreUrl: learnMoreUrl
|
||||
subject = mozL10n.get("share_email_subject6");
|
||||
body = mozL10n.get("share_email_body6", {
|
||||
callUrl: callUrl
|
||||
});
|
||||
}
|
||||
|
||||
var bodyFooter = body + footer;
|
||||
bodyFooter = bodyFooter.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n");
|
||||
mozLoop.composeEmail(
|
||||
subject,
|
||||
body.replace(/\r\n/g, "\n").replace(/\n/g, "\r\n"),
|
||||
bodyFooter,
|
||||
recipient
|
||||
);
|
||||
|
||||
|
||||
@ -210,11 +210,6 @@ let LoopCallsInternal = {
|
||||
return;
|
||||
}
|
||||
|
||||
// We set this here as it is assumed that once the user receives an incoming
|
||||
// call, they'll have had enough time to see the terms of service. See
|
||||
// bug 1046039 for background.
|
||||
Services.prefs.setCharPref("loop.seenToS", "seen");
|
||||
|
||||
// Request the information on the new call(s) associated with this version.
|
||||
// The registered FxA session is checked first, then the anonymous session.
|
||||
// Make the call to get the GUEST session regardless of whether the FXA
|
||||
|
||||
@ -270,10 +270,6 @@ loop.StandaloneMozLoop = (function(mozL10n) {
|
||||
* @param {String} value The value to set.
|
||||
*/
|
||||
setLoopPref: function(prefName, value) {
|
||||
if (prefName === "seenToS") {
|
||||
return;
|
||||
}
|
||||
|
||||
localStorage.setItem(prefName, value);
|
||||
},
|
||||
|
||||
|
||||
@ -459,22 +459,26 @@ describe("loop.panel", function() {
|
||||
});
|
||||
|
||||
describe("#render", function() {
|
||||
it("should render a ToSView", function() {
|
||||
var view = createTestPanelView();
|
||||
|
||||
TestUtils.findRenderedComponentWithType(view, loop.panel.ToSView);
|
||||
});
|
||||
|
||||
it("should not render a ToSView when the view has been 'seen'", function() {
|
||||
it("should not render a ToSView when gettingStarted.seen is true", function() {
|
||||
navigator.mozLoop.getLoopPref = function() {
|
||||
return "seen";
|
||||
return true;
|
||||
};
|
||||
var view = createTestPanelView();
|
||||
|
||||
try {
|
||||
expect(function() {
|
||||
TestUtils.findRenderedComponentWithType(view, loop.panel.ToSView);
|
||||
sinon.assert.fail("Should not find the ToSView if it has been 'seen'");
|
||||
} catch (ex) {}
|
||||
}).to.Throw(/not find/);
|
||||
});
|
||||
|
||||
it("should not render a ToSView when gettingStarted.seen is false", function() {
|
||||
navigator.mozLoop.getLoopPref = function() {
|
||||
return false;
|
||||
};
|
||||
var view = createTestPanelView();
|
||||
|
||||
expect(function() {
|
||||
TestUtils.findRenderedComponentWithType(view, loop.panel.ToSView);
|
||||
}).to.not.Throw();
|
||||
});
|
||||
|
||||
it("should render a GettingStarted view", function() {
|
||||
@ -989,70 +993,6 @@ describe("loop.panel", function() {
|
||||
});
|
||||
});
|
||||
|
||||
describe("loop.panel.ToSView", function() {
|
||||
|
||||
it("should render when the value of loop.seenToS is not set", function() {
|
||||
navigator.mozLoop.getLoopPref = function(key) {
|
||||
return {
|
||||
"gettingStarted.seen": true,
|
||||
"seenToS": "unseen"
|
||||
}[key];
|
||||
};
|
||||
|
||||
var view = TestUtils.renderIntoDocument(
|
||||
React.createElement(loop.panel.ToSView));
|
||||
|
||||
TestUtils.findRenderedDOMComponentWithClass(view, "terms-service");
|
||||
});
|
||||
|
||||
it("should not render when the value of loop.seenToS is set to 'seen'", function() {
|
||||
navigator.mozLoop.getLoopPref = function(key) {
|
||||
return {
|
||||
"gettingStarted.seen": true,
|
||||
"seenToS": "seen"
|
||||
}[key];
|
||||
};
|
||||
|
||||
var view = TestUtils.renderIntoDocument(
|
||||
React.createElement(loop.panel.ToSView));
|
||||
|
||||
expect(function() {
|
||||
TestUtils.findRenderedDOMComponentWithClass(view, "terms-service");
|
||||
}).to.Throw(/not find/);
|
||||
});
|
||||
|
||||
it("should render when the value of loop.gettingStarted.seen is false",
|
||||
function() {
|
||||
navigator.mozLoop.getLoopPref = function(key) {
|
||||
return {
|
||||
"gettingStarted.seen": false,
|
||||
"seenToS": "seen"
|
||||
}[key];
|
||||
};
|
||||
var view = TestUtils.renderIntoDocument(
|
||||
React.createElement(loop.panel.ToSView));
|
||||
|
||||
TestUtils.findRenderedDOMComponentWithClass(view, "terms-service");
|
||||
});
|
||||
|
||||
it("should render the telefonica logo after the first time use",
|
||||
function() {
|
||||
navigator.mozLoop.getLoopPref = function(key) {
|
||||
return {
|
||||
"gettingStarted.seen": false,
|
||||
"seenToS": "unseen",
|
||||
"showPartnerLogo": false
|
||||
}[key];
|
||||
};
|
||||
|
||||
var view = TestUtils.renderIntoDocument(
|
||||
React.createElement(loop.panel.ToSView));
|
||||
|
||||
expect(view.getDOMNode().querySelector(".powered-by")).eql(null);
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
describe("loop.panel.SignInRequestView", function() {
|
||||
var view;
|
||||
|
||||
|
||||
@ -581,7 +581,7 @@ describe("loop.store.RoomStore", function () {
|
||||
|
||||
sinon.assert.calledOnce(fakeMozLoop.socialShareRoom);
|
||||
sinon.assert.calledWithExactly(fakeMozLoop.socialShareRoom, origin,
|
||||
roomUrl, "share_email_subject5", "share_email_body5");
|
||||
roomUrl, "share_email_subject6", "share_email_body6" + "share_email_footer");
|
||||
});
|
||||
|
||||
it("should pass the correct data for all other Social Providers", function() {
|
||||
|
||||
@ -1272,14 +1272,6 @@ describe("loop.store.ActiveRoomStore", function () {
|
||||
|
||||
expect(store.getStoreState().roomState).eql(ROOM_STATES.HAS_PARTICIPANTS);
|
||||
});
|
||||
|
||||
it("should set the pref for ToS to `seen`", function() {
|
||||
store.remotePeerConnected();
|
||||
|
||||
sinon.assert.calledOnce(fakeMozLoop.setLoopPref);
|
||||
sinon.assert.calledWithExactly(fakeMozLoop.setLoopPref,
|
||||
"seenToS", "seen");
|
||||
});
|
||||
});
|
||||
|
||||
describe("#remotePeerDisconnected", function() {
|
||||
|
||||
@ -355,14 +355,14 @@ describe("loop.shared.utils", function() {
|
||||
// fake mozL10n
|
||||
sandbox.stub(navigator.mozL10n, "get", function(id) {
|
||||
switch(id) {
|
||||
case "share_email_subject5":
|
||||
case "share_email_subject6":
|
||||
return "subject";
|
||||
case "share_email_body5":
|
||||
case "share_email_body6":
|
||||
return "body";
|
||||
case "share_email_subject_context":
|
||||
return "subject_context";
|
||||
case "share_email_body_context":
|
||||
case "share_email_body_context2":
|
||||
return "body_context";
|
||||
case "share_email_footer":
|
||||
return "footer";
|
||||
}
|
||||
});
|
||||
composeEmail = sandbox.spy();
|
||||
@ -385,14 +385,14 @@ describe("loop.shared.utils", function() {
|
||||
|
||||
sinon.assert.calledOnce(composeEmail);
|
||||
sinon.assert.calledWith(composeEmail,
|
||||
"subject", "body", "fake@invalid.tld");
|
||||
"subject", "body" + "footer", "fake@invalid.tld");
|
||||
});
|
||||
|
||||
it("should compose a different email when context info is provided", function() {
|
||||
sharedUtils.composeCallUrlEmail("http://invalid", null, "Hello, is me you're looking for?");
|
||||
|
||||
sinon.assert.calledOnce(composeEmail);
|
||||
sinon.assert.calledWith(composeEmail, "subject_context", "body_context");
|
||||
sinon.assert.calledWith(composeEmail, "subject", "body_context" + "footer");
|
||||
});
|
||||
|
||||
it("should record a telemetry event when an email is composed", function() {
|
||||
|
||||
@ -55,12 +55,6 @@ describe("loop.StandaloneMozLoop", function() {
|
||||
|
||||
expect(localStorage.getItem("fakePref")).eql("fakeValue");
|
||||
});
|
||||
|
||||
it("should not store the value of seenToS", function() {
|
||||
mozLoop.setLoopPref("seenToS", "fakeValue1");
|
||||
|
||||
expect(localStorage.getItem("seenToS")).eql(null);
|
||||
});
|
||||
});
|
||||
|
||||
describe("#getLoopPref", function() {
|
||||
|
||||
@ -10,8 +10,6 @@ XPCOMUtils.defineLazyModuleGetter(this, "Chat",
|
||||
let openChatOrig = Chat.open;
|
||||
|
||||
add_test(function test_openChatWindow_on_notification() {
|
||||
Services.prefs.setCharPref("loop.seenToS", "unseen");
|
||||
|
||||
mockPushHandler.registrationPushURL = kEndPointUrl;
|
||||
|
||||
MozLoopService.promiseRegisteredWithServers(LOOP_SESSION_TYPE.FXA).then(() => {
|
||||
@ -25,9 +23,6 @@ add_test(function test_openChatWindow_on_notification() {
|
||||
waitForCondition(() => opened).then(() => {
|
||||
do_check_true(opened, "should open a chat window");
|
||||
|
||||
do_check_eq(Services.prefs.getCharPref("loop.seenToS"), "seen",
|
||||
"should set the pref to 'seen'");
|
||||
|
||||
run_next_test();
|
||||
}, () => {
|
||||
do_throw("should have opened a chat window");
|
||||
@ -56,9 +51,6 @@ function run_test() {
|
||||
do_register_cleanup(function() {
|
||||
// Revert original Chat.open implementation
|
||||
Chat.open = openChatOrig;
|
||||
|
||||
// clear test pref
|
||||
Services.prefs.clearUserPref("loop.seenToS");
|
||||
});
|
||||
|
||||
run_next_test();
|
||||
|
||||
@ -240,18 +240,14 @@ let gSyncPane = {
|
||||
gSyncPane.startOver(true);
|
||||
return false;
|
||||
});
|
||||
setEventListener("noFxaSignUp", "click", function () {
|
||||
setEventListener("noFxaSignUp", "command", function () {
|
||||
gSyncPane.signUp();
|
||||
return false;
|
||||
});
|
||||
setEventListener("noFxaSignIn", "click", function () {
|
||||
setEventListener("noFxaSignIn", "command", function () {
|
||||
gSyncPane.signIn();
|
||||
return false;
|
||||
});
|
||||
setEventListener("noFxaUseOldSync", "click", function () {
|
||||
gSyncPane.openOldSyncSupportPage();
|
||||
return false;
|
||||
});
|
||||
setEventListener("verifiedManage", "command",
|
||||
gSyncPane.manageFirefoxAccount);
|
||||
setEventListener("fxaUnlinkButton", "click", function () {
|
||||
@ -259,13 +255,13 @@ let gSyncPane = {
|
||||
});
|
||||
setEventListener("verifyFxaAccount", "command",
|
||||
gSyncPane.verifyFirefoxAccount);
|
||||
setEventListener("unverifiedUnlinkFxaAccount", "click", function () {
|
||||
setEventListener("unverifiedUnlinkFxaAccount", "command", function () {
|
||||
/* no warning as account can't have previously synced */
|
||||
gSyncPane.unlinkFirefoxAccount(false);
|
||||
});
|
||||
setEventListener("rejectReSignIn", "command",
|
||||
gSyncPane.reSignIn);
|
||||
setEventListener("rejectUnlinkFxaAccount", "click", function () {
|
||||
setEventListener("rejectUnlinkFxaAccount", "command", function () {
|
||||
gSyncPane.unlinkFirefoxAccount(true);
|
||||
});
|
||||
setEventListener("tosPP-small-ToS", "click", gSyncPane.openToS);
|
||||
|
||||
@ -200,112 +200,133 @@
|
||||
</vbox>
|
||||
|
||||
<!-- These panels are for the Firefox Accounts identity provider -->
|
||||
<vbox id="noFxaAccount" align="start">
|
||||
<label>&welcome.description;</label>
|
||||
<label id="noFxaSignUp" class="text-link">
|
||||
&welcome.createAccount.label;
|
||||
</label>
|
||||
<label id="noFxaSignIn" class="text-link">
|
||||
&welcome.signIn.label;
|
||||
</label>
|
||||
<separator/>
|
||||
<label id="noFxaUseOldSync" class="text-link">
|
||||
&welcome.useOldSync.label;
|
||||
</label>
|
||||
<vbox id="noFxaAccount">
|
||||
<hbox>
|
||||
<groupbox id="noFxaGroup">
|
||||
<vbox>
|
||||
<label id="noFxaCaption">&signedOut.caption;</label>
|
||||
<description id="noFxaDescription" flex="1">&signedOut.description;</description>
|
||||
<hbox class="fxaAccountBox">
|
||||
<image class="fxaFirefoxLogo"/>
|
||||
<vbox>
|
||||
<label id="signedOutAccountBoxTitle">&signedOut.accountBox.title;</label>
|
||||
<hbox>
|
||||
<button id="noFxaSignUp" label="&signedOut.accountBox.create;"/>
|
||||
<button id="noFxaSignIn" label="&signedOut.accountBox.signin;"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</groupbox>
|
||||
<image class="fxaSyncIllustration"/>
|
||||
</hbox>
|
||||
<hbox class="fxaMobilePromo">
|
||||
<label>&mobilePromo.start;</label>
|
||||
<image class="androidLogo"/>
|
||||
<label class="text-link"
|
||||
href="https://www.mozilla.org/firefox/android/">
|
||||
&mobilePromo.androidLink;
|
||||
</label>
|
||||
<label>&mobilePromo.end;</label>
|
||||
</hbox>
|
||||
<label class="androidAttribution">&androidAttribution;</label>
|
||||
</vbox>
|
||||
|
||||
<vbox id="hasFxaAccount">
|
||||
<groupbox id="fxaGroup">
|
||||
<caption><label>&syncBrand.fxAccount.label;</label></caption>
|
||||
<hbox>
|
||||
<vbox>
|
||||
<groupbox id="fxaGroup">
|
||||
<caption><label>&syncBrand.fxAccount.label;</label></caption>
|
||||
|
||||
<deck id="fxaLoginStatus">
|
||||
<deck id="fxaLoginStatus">
|
||||
|
||||
<!-- logged in and verified and all is good -->
|
||||
<hbox id="fxaLoginVerified"
|
||||
align="center">
|
||||
<hbox align="center">
|
||||
<image id="fxaProfileImage"
|
||||
onclick="gSyncPane.openChangeProfileImage();" hidden="true"
|
||||
tooltiptext="&profilePicture.tooltip;"/>
|
||||
<label id="fxaEmailAddress1"/>
|
||||
<label id="fxaDisplayName" hidden="true"/>
|
||||
<!-- logged in and verified and all is good -->
|
||||
<hbox id="fxaLoginVerified" class="fxaAccountBox">
|
||||
<image id="fxaProfileImage"
|
||||
onclick="gSyncPane.openChangeProfileImage();" hidden="true"
|
||||
tooltiptext="&profilePicture.tooltip;" class="actionable"/>
|
||||
<vbox>
|
||||
<label id="fxaEmailAddress1"/>
|
||||
<label id="fxaDisplayName" hidden="true"/>
|
||||
<hbox class="fxaAccountBoxButtons">
|
||||
<button id="verifiedManage" label="&manage.label;"/>
|
||||
<button id="fxaUnlinkButton" label="&disconnect.label;"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
|
||||
<!-- logged in to an unverified account -->
|
||||
<hbox id="fxaLoginUnverified" class="fxaAccountBox">
|
||||
<image id="fxaProfileImage"/>
|
||||
<vbox>
|
||||
<hbox>
|
||||
<vbox><image id="fxaLoginRejectedWarning"/></vbox>
|
||||
<description>
|
||||
&signedInUnverified.beforename.label;
|
||||
<label id="fxaEmailAddress2"/>
|
||||
&signedInUnverified.aftername.label;
|
||||
</description>
|
||||
</hbox>
|
||||
<hbox class="fxaAccountBoxButtons">
|
||||
<button id="verifyFxaAccount" label="&verify.label;"/>
|
||||
<button id="unverifiedUnlinkFxaAccount" label="&forget.label;"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
|
||||
<!-- logged in locally but server rejected credentials -->
|
||||
<hbox id="fxaLoginRejected" class="fxaAccountBox">
|
||||
<image id="fxaProfileImage"/>
|
||||
<vbox>
|
||||
<hbox>
|
||||
<vbox><image id="fxaLoginRejectedWarning"/></vbox>
|
||||
<description>
|
||||
&signedInLoginFailure.beforename.label;
|
||||
<label id="fxaEmailAddress3"/>
|
||||
&signedInLoginFailure.aftername.label;
|
||||
</description>
|
||||
</hbox>
|
||||
<hbox class="fxaAccountBoxButtons">
|
||||
<button id="rejectReSignIn" label="&signIn.label;"/>
|
||||
<button id="rejectUnlinkFxaAccount" label="&forget.label;"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</deck>
|
||||
</groupbox>
|
||||
<groupbox id="syncOptions">
|
||||
<caption><label>&signedIn.engines.caption;</label></caption>
|
||||
<hbox id="fxaSyncEngines">
|
||||
<vbox align="start">
|
||||
<checkbox label="&engine.tabs.label;"
|
||||
accesskey="&engine.tabs.accesskey;"
|
||||
preference="engine.tabs"/>
|
||||
<checkbox label="&engine.bookmarks.label;"
|
||||
accesskey="&engine.bookmarks.accesskey;"
|
||||
preference="engine.bookmarks"/>
|
||||
<checkbox label="&engine.passwords.label;"
|
||||
accesskey="&engine.passwords.accesskey;"
|
||||
preference="engine.passwords"/>
|
||||
</vbox>
|
||||
<vbox align="start">
|
||||
<checkbox label="&engine.history.label;"
|
||||
accesskey="&engine.history.accesskey;"
|
||||
preference="engine.history"/>
|
||||
<checkbox label="&engine.addons.label;"
|
||||
accesskey="&engine.addons.accesskey;"
|
||||
preference="engine.addons"/>
|
||||
<checkbox label="&engine.prefs.label;"
|
||||
accesskey="&engine.prefs.accesskey;"
|
||||
preference="engine.prefs"/>
|
||||
</vbox>
|
||||
<spacer/>
|
||||
</hbox>
|
||||
<spacer flex="1"/>
|
||||
<button id="verifiedManage"
|
||||
label="&manage.label;"/>
|
||||
<button id="fxaUnlinkButton"
|
||||
label="&disconnect.label;"/>
|
||||
</hbox>
|
||||
|
||||
<!-- logged in to an unverified account -->
|
||||
<hbox id="fxaLoginUnverified"
|
||||
flex="1">
|
||||
<description>
|
||||
&signedInUnverified.beforename.label;
|
||||
<label id="fxaEmailAddress2"/>
|
||||
&signedInUnverified.aftername.label;
|
||||
</description>
|
||||
<spacer flex="1"/>
|
||||
<vbox align="end">
|
||||
<button id="verifyFxaAccount"
|
||||
label="&verify.label;"/>
|
||||
<label id="unverifiedUnlinkFxaAccount" class="text-link">
|
||||
&forget.label;
|
||||
</label>
|
||||
</vbox>
|
||||
</hbox>
|
||||
|
||||
<!-- logged in locally but server rejected credentials -->
|
||||
<hbox id="fxaLoginRejected"
|
||||
flex="1">
|
||||
<vbox>
|
||||
<image id="fxaLoginRejectedWarning"/>
|
||||
</vbox>
|
||||
<description>
|
||||
&signedInLoginFailure.beforename.label;
|
||||
<label id="fxaEmailAddress3"/>
|
||||
&signedInLoginFailure.aftername.label;
|
||||
</description>
|
||||
<spacer flex="1"/>
|
||||
<vbox align="end">
|
||||
<button id="rejectReSignIn"
|
||||
label="&signIn.label;"/>
|
||||
<label id="rejectUnlinkFxaAccount" class="text-link">
|
||||
&forget.label;
|
||||
</label>
|
||||
</vbox>
|
||||
</hbox>
|
||||
</deck>
|
||||
</groupbox>
|
||||
|
||||
<groupbox id="syncOptions">
|
||||
<caption><label>&syncBrand.shortName.label;</label></caption>
|
||||
<hbox id="fxaSyncEngines">
|
||||
<vbox align="start">
|
||||
<checkbox label="&engine.tabs.label;"
|
||||
accesskey="&engine.tabs.accesskey;"
|
||||
preference="engine.tabs"/>
|
||||
<checkbox label="&engine.bookmarks.label;"
|
||||
accesskey="&engine.bookmarks.accesskey;"
|
||||
preference="engine.bookmarks"/>
|
||||
<checkbox label="&engine.passwords.label;"
|
||||
accesskey="&engine.passwords.accesskey;"
|
||||
preference="engine.passwords"/>
|
||||
</vbox>
|
||||
<vbox align="start">
|
||||
<checkbox label="&engine.history.label;"
|
||||
accesskey="&engine.history.accesskey;"
|
||||
preference="engine.history"/>
|
||||
<checkbox label="&engine.addons.label;"
|
||||
accesskey="&engine.addons.accesskey;"
|
||||
preference="engine.addons"/>
|
||||
<checkbox label="&engine.prefs.label;"
|
||||
accesskey="&engine.prefs.accesskey;"
|
||||
preference="engine.prefs"/>
|
||||
</vbox>
|
||||
<spacer/>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
</groupbox>
|
||||
</vbox>
|
||||
<spacer flex="1"/>
|
||||
<image class="fxaSyncIllustration"/>
|
||||
</hbox>
|
||||
<spacer class="separator"/>
|
||||
<groupbox>
|
||||
<caption>
|
||||
<label accesskey="&syncDeviceName.accesskey;"
|
||||
@ -314,9 +335,10 @@
|
||||
</label>
|
||||
</caption>
|
||||
<hbox id="fxaDeviceName">
|
||||
<hbox flex="1">
|
||||
<hbox>
|
||||
<textbox id="fxaSyncComputerName" disabled="true" flex="1"/>
|
||||
</hbox>
|
||||
<spacer flex="1"/>
|
||||
<hbox>
|
||||
<button id="fxaChangeDeviceName"
|
||||
label="&changeSyncDeviceName.label;"/>
|
||||
@ -329,6 +351,16 @@
|
||||
</hbox>
|
||||
</hbox>
|
||||
</groupbox>
|
||||
<spacer class="separator"/>
|
||||
<hbox class="fxaMobilePromo">
|
||||
<label>&mobilePromo.start;</label>
|
||||
<image class="androidLogo"/>
|
||||
<label class="text-link"
|
||||
href="https://www.mozilla.org/firefox/android/">
|
||||
&mobilePromo.androidLink;
|
||||
</label>
|
||||
<label>&mobilePromo.end;</label>
|
||||
</hbox>
|
||||
<spacer flex="1"/>
|
||||
<vbox id="tosPP-small">
|
||||
<label id="tosPP-small-ToS" class="text-link">
|
||||
@ -338,5 +370,6 @@
|
||||
&fxaPrivacyNotice.link.label;
|
||||
</label>
|
||||
</vbox>
|
||||
<label class="androidAttribution">&androidAttribution;</label>
|
||||
</vbox>
|
||||
</deck>
|
||||
|
||||
@ -55,18 +55,15 @@ problem_accessing_account=There Was A Problem Accessing Your Account
|
||||
## the appropriate action.
|
||||
retry_button=Retry
|
||||
|
||||
share_email_subject5={{clientShortname2}} — Join the conversation
|
||||
## LOCALIZATION NOTE (share_email_subject_context): This is the alternate email
|
||||
## subject when a conversation is shared with a context attached.
|
||||
## {{clientShortName2}} will be replaced with the respective string in this file.
|
||||
## {{title}} will be replaced with the title of an HTML document.
|
||||
share_email_subject_context={{clientShortname2}} conversation: {{title}}
|
||||
## LOCALIZATION NOTE (share_email_body4): In this item, don't translate the
|
||||
share_email_subject6=Join me for a video conversation
|
||||
## LOCALIZATION NOTE (share_email_body6): In this item, don't translate the
|
||||
## part between {{..}} and leave the \n\n part alone
|
||||
share_email_body5=Hello!\n\nJoin me for a video conversation on {{clientShortname2}}.\n\nIt's the easiest way to connect by video with anyone anywhere. With {{clientSuperShortname}}, you don't have to download or install anything. Just click or paste this link into your {{brandShortname}}, Opera or Chrome browser to join the conversation:\n\n{{callUrl}}\n\nIf you'd like to learn more about {{clientSuperShortname}} and how you can start your own free video conversations, visit {{learnMoreUrl}}\n\nTalk to you soon!
|
||||
## LOCALIZATION NOTE (share_email_body_context): In this item, don't translate
|
||||
share_email_body6=Click the Firefox Hello link to connect to the conversation now: {{callUrl}}
|
||||
## LOCALIZATION NOTE (share_email_body_context2): In this item, don't translate
|
||||
## the part between {{..}} and leave the \n\n part alone.
|
||||
share_email_body_context=Hello!\n\nJoin me for a video conversation on {{clientShortname2}} about:\n{{title}}.\n\nIt's the easiest way to connect by video with anyone anywhere. With {{clientSuperShortname}}, you don't have to download or install anything. Just click or paste this link into your {{brandShortname}}, Opera or Chrome browser to join the conversation:\n\n{{callUrl}}\n\nIf you'd like to learn more about {{clientSuperShortname}} and how you can start your own free video conversations, visit {{learnMoreUrl}}\n\nTalk to you soon!
|
||||
share_email_body_context2=Join me for a video conversation. Click the Firefox Hello link to connect now: {{callUrl}}\n\nLet’s talk about this during our conversation: {{title}}
|
||||
## LOCALIZATION NOTE (share_email_footer): Common footer content for both email types
|
||||
share_email_footer=\n\n________\nJoin and create video conversations free with Firefox Hello. Connect easily over video with anyone, anywhere. No downloads or registration. Learn more at http://www.firefox.com/hello
|
||||
## LOCALIZATION NOTE (share_tweeet): In this item, don't translate the part
|
||||
## between {{..}}. Please keep the text below 117 characters to make sure it fits
|
||||
## in a tweet.
|
||||
|
||||
@ -83,3 +83,17 @@ both, to better adapt this sentence to their language.
|
||||
<!ENTITY welcome.createAccount.label "Create Account">
|
||||
|
||||
<!ENTITY welcome.useOldSync.label "Using an older version of Sync?">
|
||||
|
||||
<!ENTITY signedOut.caption "Take your Web with you">
|
||||
<!ENTITY signedOut.description "Synchronize your bookmarks, history, tabs, passwords, add-ons, and preferences across all your devices.">
|
||||
<!ENTITY signedOut.accountBox.title "Connect with a &syncBrand.fxAccount.label;">
|
||||
<!ENTITY signedOut.accountBox.create "Create Account">
|
||||
<!ENTITY signedOut.accountBox.signin "Sign In">
|
||||
|
||||
<!ENTITY signedIn.engines.caption "Sync between all devices">
|
||||
|
||||
<!ENTITY mobilePromo.start "Download Firefox for ">
|
||||
<!-- LOCALIZATION NOTE (mobilePromo.androidLink): This is a link title that links to https://www.mozilla.org/firefox/android/ -->
|
||||
<!ENTITY mobilePromo.androidLink "Android™">
|
||||
<!ENTITY mobilePromo.end " to sync with your mobile device.">
|
||||
<!ENTITY androidAttribution "Android is a trademark of Google Inc.">
|
||||
|
||||
@ -222,7 +222,14 @@ browser.jar:
|
||||
skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
|
||||
skin/classic/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg)
|
||||
skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css)
|
||||
skin/classic/browser/fxa/default-profile-image.svg (../shared/fxa/default-profile-image.svg)
|
||||
skin/classic/browser/fxa/default-avatar.png (../shared/fxa/default-avatar.png)
|
||||
skin/classic/browser/fxa/default-avatar@2x.png (../shared/fxa/default-avatar@2x.png)
|
||||
skin/classic/browser/fxa/logo.png (../shared/fxa/logo.png)
|
||||
skin/classic/browser/fxa/logo@2x.png (../shared/fxa/logo@2x.png)
|
||||
skin/classic/browser/fxa/sync-illustration.png (../shared/fxa/sync-illustration.png)
|
||||
skin/classic/browser/fxa/sync-illustration@2x.png (../shared/fxa/sync-illustration@2x.png)
|
||||
skin/classic/browser/fxa/android.png (../shared/fxa/android.png)
|
||||
skin/classic/browser/fxa/android@2x.png (../shared/fxa/android@2x.png)
|
||||
skin/classic/browser/preferences/applications.css (preferences/applications.css)
|
||||
skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
|
||||
skin/classic/browser/preferences/search.css (preferences/search.css)
|
||||
|
||||
@ -298,7 +298,14 @@ browser.jar:
|
||||
skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
|
||||
skin/classic/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg)
|
||||
skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css)
|
||||
skin/classic/browser/fxa/default-profile-image.svg (../shared/fxa/default-profile-image.svg)
|
||||
skin/classic/browser/fxa/default-avatar.png (../shared/fxa/default-avatar.png)
|
||||
skin/classic/browser/fxa/default-avatar@2x.png (../shared/fxa/default-avatar@2x.png)
|
||||
skin/classic/browser/fxa/logo.png (../shared/fxa/logo.png)
|
||||
skin/classic/browser/fxa/logo@2x.png (../shared/fxa/logo@2x.png)
|
||||
skin/classic/browser/fxa/sync-illustration.png (../shared/fxa/sync-illustration.png)
|
||||
skin/classic/browser/fxa/sync-illustration@2x.png (../shared/fxa/sync-illustration@2x.png)
|
||||
skin/classic/browser/fxa/android.png (../shared/fxa/android.png)
|
||||
skin/classic/browser/fxa/android@2x.png (../shared/fxa/android@2x.png)
|
||||
skin/classic/browser/preferences/applications.css (preferences/applications.css)
|
||||
skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
|
||||
skin/classic/browser/preferences/search.css (preferences/search.css)
|
||||
|
||||
@ -238,10 +238,6 @@ html|a.inline-link:-moz-focusring {
|
||||
margin-bottom: 1em;
|
||||
}
|
||||
|
||||
#fxaUnlinkButton {
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#noFxaAccount {
|
||||
margin: 12px 4px;
|
||||
line-height: 1.2em;
|
||||
|
||||
@ -702,7 +702,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton {
|
||||
}
|
||||
|
||||
#PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
|
||||
list-style-image: url(chrome://browser/skin/fxa/default-profile-image.svg);
|
||||
list-style-image: url(chrome://browser/skin/fxa/default-avatar.png)
|
||||
}
|
||||
|
||||
#PanelUI-customize:hover,
|
||||
@ -1498,6 +1498,10 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left {
|
||||
list-style-image: url(chrome://branding/content/icon32.png);
|
||||
}
|
||||
|
||||
#PanelUI-footer-fxa[fxaprofileimage="enabled"] > #PanelUI-fxa-status > #PanelUI-fxa-avatar {
|
||||
list-style-image: url(chrome://browser/skin/fxa/default-avatar@2x.png)
|
||||
}
|
||||
|
||||
#PanelUI-fxa-label,
|
||||
#PanelUI-fxa-icon {
|
||||
list-style-image: url(chrome://browser/skin/sync-horizontalbar@2x.png);
|
||||
|
||||
BIN
browser/themes/shared/fxa/android.png
Normal file
BIN
browser/themes/shared/fxa/android.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 15 KiB |
BIN
browser/themes/shared/fxa/android@2x.png
Normal file
BIN
browser/themes/shared/fxa/android@2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 736 B |
BIN
browser/themes/shared/fxa/default-avatar.png
Normal file
BIN
browser/themes/shared/fxa/default-avatar.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
BIN
browser/themes/shared/fxa/default-avatar@2x.png
Normal file
BIN
browser/themes/shared/fxa/default-avatar@2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.5 KiB |
@ -1,9 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- This Source Code Form is subject to the terms of the Mozilla Public
|
||||
- License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
|
||||
<path fill="#c3cfd8" d="M500-0.3c276.1,0,500,223.9,500,500s-223.9,500-500,500S0,775.8,0,499.7C0,223.5,223.9-0.3,500-0.3z"/>
|
||||
<circle fill="#fff" cx="500" cy="317" r="139.1"/>
|
||||
<path fill="#fff" d="M751.8,643.6L751.8,643.6c0.1-2.3,0.2-4.6,0.2-6.9c0-68-55.3-127-136.2-156.3L505.9,590.4h0 c-0.4,29.8-1.4,58.8-2.8,86.6c-1,0.1-2,0.3-3.1,0.3s-2-0.2-3.1-0.3c-1.4-27.9-2.4-56.9-2.8-86.7h0L384.3,480.4 C303.3,509.7,248,568.7,248,636.7c0,2.3,0.1,4.6,0.2,6.9l7.4,49.7c57.1,72,145.4,118.2,244.4,118.2c99,0,187.3-46.2,244.4-118.2 L751.8,643.6z"/>
|
||||
</svg>
|
||||
|
Before Width: | Height: | Size: 861 B |
BIN
browser/themes/shared/fxa/logo.png
Normal file
BIN
browser/themes/shared/fxa/logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 17 KiB |
BIN
browser/themes/shared/fxa/logo@2x.png
Normal file
BIN
browser/themes/shared/fxa/logo@2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.4 KiB |
BIN
browser/themes/shared/fxa/sync-illustration.png
Normal file
BIN
browser/themes/shared/fxa/sync-illustration.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 18 KiB |
BIN
browser/themes/shared/fxa/sync-illustration@2x.png
Normal file
BIN
browser/themes/shared/fxa/sync-illustration@2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 8.5 KiB |
@ -223,32 +223,6 @@ description > html|a {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#fxaProfileImage {
|
||||
width: 60px;
|
||||
height: 60px;
|
||||
border-radius: 50%;
|
||||
border-width: 5px;
|
||||
border-color: red;
|
||||
background-image: url(chrome://browser/skin/fxa/default-profile-image.svg);
|
||||
background-size: contain;
|
||||
cursor: pointer;
|
||||
-moz-margin-end: 15px;
|
||||
}
|
||||
|
||||
#fxaProfileImage:hover {
|
||||
box-shadow: 0px 0px 0px 1px #0095DD;
|
||||
}
|
||||
|
||||
#fxaProfileImage:active {
|
||||
box-shadow: 0px 0px 0px 1px #ff9500;
|
||||
}
|
||||
|
||||
#noFxaAccount {
|
||||
/* Overriding the margins from the base preferences.css theme file.
|
||||
These overrides can be simplified by fixing bug 1027174 */
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#weavePrefsDeck > vbox > label,
|
||||
#weavePrefsDeck > vbox > groupbox,
|
||||
#weavePrefsDeck > vbox > description,
|
||||
@ -397,16 +371,123 @@ description > html|a {
|
||||
* Sync
|
||||
*/
|
||||
|
||||
#fxaProfileImage {
|
||||
width: 60px;
|
||||
max-height: 60px;
|
||||
border-radius: 50%;
|
||||
background-image: url(chrome://browser/skin/fxa/default-avatar.png);
|
||||
background-size: contain;
|
||||
margin-inline-end: 15px;
|
||||
}
|
||||
|
||||
#fxaProfileImage.actionable {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
#fxaProfileImage.actionable:hover {
|
||||
box-shadow: 0px 0px 0px 1px #0095DD;
|
||||
}
|
||||
|
||||
#fxaProfileImage.actionable:hover:active {
|
||||
box-shadow: 0px 0px 0px 1px #ff9500;
|
||||
}
|
||||
|
||||
#noFxaAccount {
|
||||
/* Overriding the margins from the base preferences.css theme file.
|
||||
These overrides can be simplified by fixing bug 1027174 */
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
#noFxaGroup {
|
||||
-moz-box-flex: 1;
|
||||
}
|
||||
|
||||
#noFxaGroup > vbox {
|
||||
-moz-box-align: start;
|
||||
}
|
||||
|
||||
#fxaSyncEngines > vbox:first-child {
|
||||
margin-right: 80px;
|
||||
}
|
||||
|
||||
#fxaSyncComputerName {
|
||||
margin-left: 0px;
|
||||
margin-inline-start: 0px;
|
||||
width: 500px;
|
||||
}
|
||||
|
||||
#tosPP-small-ToS {
|
||||
margin-bottom: 1em;
|
||||
margin-bottom: 14px;
|
||||
}
|
||||
|
||||
#noFxaCaption {
|
||||
font-weight: bold;
|
||||
margin-bottom: 11px;
|
||||
}
|
||||
|
||||
.fxaSyncIllustration {
|
||||
margin-top: 35px;
|
||||
}
|
||||
|
||||
#syncOptions caption {
|
||||
margin-bottom: 11px;
|
||||
}
|
||||
|
||||
#fxaDeviceName {
|
||||
margin-bottom: 27.5px;
|
||||
}
|
||||
|
||||
#noFxaDescription {
|
||||
margin-bottom: 20px !important;
|
||||
}
|
||||
|
||||
.separator {
|
||||
border-bottom: 1px solid var(--in-content-header-border-color);
|
||||
}
|
||||
|
||||
.fxaAccountBox {
|
||||
border: 1px solid #D1D2D3;
|
||||
border-radius: 5px;
|
||||
padding: 14px 20px 14px 14px;
|
||||
}
|
||||
|
||||
#signedOutAccountBoxTitle {
|
||||
margin-inline-start: 6px !important;
|
||||
font-weight: bold;
|
||||
margin-bottom: 11px;
|
||||
}
|
||||
|
||||
.fxaAccountBox button {
|
||||
padding-left: 11px;
|
||||
padding-right: 11px;
|
||||
}
|
||||
|
||||
.fxaSyncIllustration {
|
||||
width: 231px;
|
||||
max-height: 200px;
|
||||
list-style-image: url(chrome://browser/skin/fxa/sync-illustration.png)
|
||||
}
|
||||
|
||||
.fxaFirefoxLogo {
|
||||
list-style-image: url(chrome://browser/skin/fxa/logo.png);
|
||||
max-width: 64px;
|
||||
margin-inline-end: 14px;
|
||||
}
|
||||
|
||||
#noFxaAccount .fxaMobilePromo {
|
||||
margin-bottom: 55px;
|
||||
}
|
||||
|
||||
#hasFxaAccount .fxaMobilePromo {
|
||||
margin-bottom: 41px;
|
||||
margin-top: 27.5px;
|
||||
}
|
||||
|
||||
.fxaMobilePromo > label {
|
||||
margin-inline-start: 0;
|
||||
}
|
||||
|
||||
#hasFxaAccount .fxaAccountBoxButtons {
|
||||
margin-top: 11px;
|
||||
}
|
||||
|
||||
#fxaLoginRejectedWarning {
|
||||
@ -414,3 +495,38 @@ description > html|a {
|
||||
filter: drop-shadow(0 1px 0 hsla(206, 50%, 10%, .15));
|
||||
margin: 4px 8px 0px 0px;
|
||||
}
|
||||
|
||||
#syncOptions {
|
||||
margin-bottom: 27.5px;
|
||||
}
|
||||
|
||||
.androidLogo {
|
||||
list-style-image: url(chrome://browser/skin/fxa/android.png);
|
||||
max-width: 24px;
|
||||
margin-top: -4px;
|
||||
margin-inline-end: 4px;
|
||||
}
|
||||
|
||||
#tosPP-small {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.androidAttribution {
|
||||
font-size: 12px;
|
||||
color: #D1D2D3;
|
||||
}
|
||||
|
||||
@media (min-resolution: 1.1dppx) {
|
||||
.fxaSyncIllustration {
|
||||
list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png)
|
||||
}
|
||||
.fxaFirefoxLogo {
|
||||
list-style-image: url(chrome://browser/skin/fxa/logo@2x.png);
|
||||
}
|
||||
.androidLogo {
|
||||
list-style-image: url(chrome://browser/skin/fxa/android@2x.png);
|
||||
}
|
||||
#fxaProfileImage {
|
||||
background-image: url(chrome://browser/skin/fxa/default-avatar@2x.png);
|
||||
}
|
||||
}
|
||||
|
||||
@ -307,7 +307,14 @@ browser.jar:
|
||||
skin/classic/browser/preferences/in-content/favicon.ico (../shared/incontentprefs/favicon.ico)
|
||||
skin/classic/browser/preferences/in-content/icons.svg (../shared/incontentprefs/icons.svg)
|
||||
skin/classic/browser/preferences/in-content/search.css (../shared/incontentprefs/search.css)
|
||||
skin/classic/browser/fxa/default-profile-image.svg (../shared/fxa/default-profile-image.svg)
|
||||
skin/classic/browser/fxa/default-avatar.png (../shared/fxa/default-avatar.png)
|
||||
skin/classic/browser/fxa/default-avatar@2x.png (../shared/fxa/default-avatar@2x.png)
|
||||
skin/classic/browser/fxa/logo.png (../shared/fxa/logo.png)
|
||||
skin/classic/browser/fxa/logo@2x.png (../shared/fxa/logo@2x.png)
|
||||
skin/classic/browser/fxa/sync-illustration.png (../shared/fxa/sync-illustration.png)
|
||||
skin/classic/browser/fxa/sync-illustration@2x.png (../shared/fxa/sync-illustration@2x.png)
|
||||
skin/classic/browser/fxa/android.png (../shared/fxa/android.png)
|
||||
skin/classic/browser/fxa/android@2x.png (../shared/fxa/android@2x.png)
|
||||
skin/classic/browser/preferences/applications.css (preferences/applications.css)
|
||||
skin/classic/browser/preferences/aboutPermissions.css (preferences/aboutPermissions.css)
|
||||
skin/classic/browser/preferences/search.css (preferences/search.css)
|
||||
|
||||
@ -22,7 +22,7 @@ AutoGlobalTimelineMarker::AutoGlobalTimelineMarker(const char* aName
|
||||
return;
|
||||
}
|
||||
|
||||
TimelineConsumers::AddMarkerToAllObservedDocShells(mName, TRACING_INTERVAL_START);
|
||||
TimelineConsumers::AddMarkerForAllObservedDocShells(mName, TRACING_INTERVAL_START);
|
||||
}
|
||||
|
||||
AutoGlobalTimelineMarker::~AutoGlobalTimelineMarker()
|
||||
@ -31,7 +31,7 @@ AutoGlobalTimelineMarker::~AutoGlobalTimelineMarker()
|
||||
return;
|
||||
}
|
||||
|
||||
TimelineConsumers::AddMarkerToAllObservedDocShells(mName, TRACING_INTERVAL_END);
|
||||
TimelineConsumers::AddMarkerForAllObservedDocShells(mName, TRACING_INTERVAL_END);
|
||||
}
|
||||
|
||||
} // namespace mozilla
|
||||
|
||||
@ -84,8 +84,8 @@ TimelineConsumers::AddMarkerForDocShell(nsDocShell* aDocShell,
|
||||
}
|
||||
|
||||
void
|
||||
TimelineConsumers::AddMarkerToDocShellsList(Vector<nsRefPtr<nsDocShell>>& aDocShells,
|
||||
const char* aName, TracingMetadata aMetaData)
|
||||
TimelineConsumers::AddMarkerForDocShellsList(Vector<nsRefPtr<nsDocShell>>& aDocShells,
|
||||
const char* aName, TracingMetadata aMetaData)
|
||||
{
|
||||
for (Vector<nsRefPtr<nsDocShell>>::Range range = aDocShells.all();
|
||||
!range.empty();
|
||||
@ -95,7 +95,7 @@ TimelineConsumers::AddMarkerToDocShellsList(Vector<nsRefPtr<nsDocShell>>& aDocSh
|
||||
}
|
||||
|
||||
void
|
||||
TimelineConsumers::AddMarkerToAllObservedDocShells(const char* aName, TracingMetadata aMetaData)
|
||||
TimelineConsumers::AddMarkerForAllObservedDocShells(const char* aName, TracingMetadata aMetaData)
|
||||
{
|
||||
Vector<nsRefPtr<nsDocShell>> docShells;
|
||||
if (!GetKnownDocShells(docShells)) {
|
||||
@ -104,7 +104,7 @@ TimelineConsumers::AddMarkerToAllObservedDocShells(const char* aName, TracingMet
|
||||
return;
|
||||
}
|
||||
|
||||
AddMarkerToDocShellsList(docShells, aName, aMetaData);
|
||||
AddMarkerForDocShellsList(docShells, aName, aMetaData);
|
||||
}
|
||||
|
||||
} // namespace mozilla
|
||||
|
||||
@ -37,9 +37,9 @@ public:
|
||||
UniquePtr<TimelineMarker>&& aMarker);
|
||||
static void AddMarkerForDocShell(nsDocShell* aDocShell,
|
||||
const char* aName, TracingMetadata aMetaData);
|
||||
static void AddMarkerToDocShellsList(Vector<nsRefPtr<nsDocShell>>& aDocShells,
|
||||
const char* aName, TracingMetadata aMetaData);
|
||||
static void AddMarkerToAllObservedDocShells(const char* aName, TracingMetadata aMetaData);
|
||||
static void AddMarkerForDocShellsList(Vector<nsRefPtr<nsDocShell>>& aDocShells,
|
||||
const char* aName, TracingMetadata aMetaData);
|
||||
static void AddMarkerForAllObservedDocShells(const char* aName, TracingMetadata aMetaData);
|
||||
};
|
||||
|
||||
} // namespace mozilla
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothcommon_h
|
||||
#define mozilla_dom_bluetooth_bluetoothcommon_h
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothCommon_h
|
||||
#define mozilla_dom_bluetooth_BluetoothCommon_h
|
||||
|
||||
#include "mozilla/Compiler.h"
|
||||
#include "mozilla/Observer.h"
|
||||
@ -810,4 +810,4 @@ enum BluetoothGapDataType {
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif // mozilla_dom_bluetooth_bluetoothcommon_h__
|
||||
#endif // mozilla_dom_bluetooth_BluetoothCommon_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothhidmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothhidmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothHidManager_h
|
||||
#define mozilla_dom_bluetooth_BluetoothHidManager_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "BluetoothProfileController.h"
|
||||
@ -46,4 +46,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif //#ifndef mozilla_dom_bluetooth_bluetoothhidmanager_h__
|
||||
#endif // mozilla_dom_bluetooth_BluetoothHidManager_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothinterface_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothinterface_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothInterface_h
|
||||
#define mozilla_dom_bluetooth_BluetoothInterface_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "mozilla/dom/bluetooth/BluetoothTypes.h"
|
||||
@ -1254,4 +1254,4 @@ protected:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothInterface_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothprofilemanagerbase_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothprofilemanagerbase_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothProfileManagerBase_h
|
||||
#define mozilla_dom_bluetooth_BluetoothProfileManagerBase_h
|
||||
|
||||
/**
|
||||
* Error Messages used in Bluetooth profiles
|
||||
@ -108,4 +108,4 @@ public: \
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif //#ifndef mozilla_dom_bluetooth_bluetoothprofilemanagerbase_h__
|
||||
#endif // mozilla_dom_bluetooth_BluetoothProfileManagerBase_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothrillistener_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothrillistener_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothRilListener_h
|
||||
#define mozilla_dom_bluetooth_BluetoothRilListener_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
|
||||
@ -137,4 +137,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothRilListener_h
|
||||
|
||||
@ -52,4 +52,4 @@ public: \
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothSocketObserver_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothutils_h
|
||||
#define mozilla_dom_bluetooth_bluetoothutils_h
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothUtils_h
|
||||
#define mozilla_dom_bluetooth_BluetoothUtils_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "js/TypeDecls.h"
|
||||
@ -159,4 +159,4 @@ DispatchStatusChangedEvent(const nsAString& aType,
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothUtils_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothuuid_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothuuid_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothUuid_h
|
||||
#define mozilla_dom_bluetooth_BluetoothUuid_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
|
||||
@ -82,4 +82,4 @@ enum BluetoothReservedChannels {
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothUuid_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_obexbase_h__
|
||||
#define mozilla_dom_bluetooth_obexbase_h__
|
||||
#ifndef mozilla_dom_bluetooth_ObexBase_h
|
||||
#define mozilla_dom_bluetooth_ObexBase_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "nsAutoPtr.h"
|
||||
@ -337,4 +337,4 @@ bool ParseHeaders(const uint8_t* aHeaderStart,
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_ObexBase_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetootha2dpmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetootha2dpmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothA2dpManager_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothA2dpManager_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "BluetoothInterface.h"
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothdaemona2dpinterface_h
|
||||
#define mozilla_dom_bluetooth_bluetoothdaemona2dpinterface_h
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonA2dpInterface_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonA2dpInterface_h
|
||||
|
||||
#include "BluetoothDaemonHelpers.h"
|
||||
#include "BluetoothInterface.h"
|
||||
@ -162,4 +162,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonA2dpInterface_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothdaemonavrcpinterface_h
|
||||
#define mozilla_dom_bluetooth_bluetoothdaemonavrcpinterface_h
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonAvrcpInterface_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonAvrcpInterface_h
|
||||
|
||||
#include "BluetoothDaemonHelpers.h"
|
||||
#include "BluetoothInterface.h"
|
||||
@ -361,4 +361,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonAvrcpInterface_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothdaemongattinterface_h
|
||||
#define mozilla_dom_bluetooth_bluetoothdaemongattinterface_h
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonGattInterface_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonGattInterface_h
|
||||
|
||||
#include "BluetoothDaemonHelpers.h"
|
||||
#include "BluetoothInterface.h"
|
||||
@ -1035,4 +1035,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonGattInterface_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothdaemonhandsfreeinterface_h
|
||||
#define mozilla_dom_bluetooth_bluetoothdaemonhandsfreeinterface_h
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHandsfreeInterface_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHandsfreeInterface_h
|
||||
|
||||
#include "BluetoothDaemonHelpers.h"
|
||||
#include "BluetoothInterface.h"
|
||||
@ -471,4 +471,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHandsfreeInterface_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemonhelpers_h__
|
||||
#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemonhelpers_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHelpers_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHelpers_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "mozilla/ArrayUtils.h"
|
||||
@ -1191,4 +1191,4 @@ public:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonHelpers_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemoninterface_h__
|
||||
#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemoninterface_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonInterface_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonInterface_h
|
||||
|
||||
#include "BluetoothInterface.h"
|
||||
#include "mozilla/ipc/DaemonSocketConsumer.h"
|
||||
@ -167,4 +167,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonInterface_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsetupinterface_h__
|
||||
#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsetupinterface_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSetupInterface_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSetupInterface_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
|
||||
@ -27,4 +27,4 @@ protected:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSetupInterface_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsocketinterface_h__
|
||||
#define mozilla_dom_bluetooth_bluedroid_bluetoothdaemonsocketinterface_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSocketInterface_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSocketInterface_h
|
||||
|
||||
#include "BluetoothDaemonHelpers.h"
|
||||
#include "BluetoothInterface.h"
|
||||
@ -122,4 +122,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothDaemonSocketInterface_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothgattmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothgattmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothGattManager_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothGattManager_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "BluetoothInterface.h"
|
||||
@ -205,4 +205,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothGattManager_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothoppmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothoppmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothOppManager_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothOppManager_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "BluetoothProfileManagerBase.h"
|
||||
@ -219,4 +219,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothOppManager_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothpbapmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothpbapmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothPbapManager_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothPbapManager_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "BluetoothProfileManagerBase.h"
|
||||
@ -99,4 +99,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothPbapManager_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothservicebluedroid_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothservicebluedroid_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothServiceBluedroid_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothServiceBluedroid_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "BluetoothInterface.h"
|
||||
@ -395,4 +395,4 @@ protected:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothServiceBluedroid_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothSocket_h
|
||||
#define mozilla_dom_bluetooth_BluetoothSocket_h
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothSocket_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothSocket_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "mozilla/ipc/DataSocket.h"
|
||||
@ -98,4 +98,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothSocket_h
|
||||
|
||||
@ -4,6 +4,9 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothSocketMessageWatcher_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothSocketMessageWatcher_h
|
||||
|
||||
#include "base/message_loop.h"
|
||||
#include "BluetoothCommon.h"
|
||||
|
||||
@ -107,3 +110,5 @@ private:
|
||||
};
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothSocketMessageWatcher_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothhfpmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothhfpmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
|
||||
|
||||
#include "BluetoothHfpManagerBase.h"
|
||||
|
||||
@ -48,4 +48,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothhfpmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothhfpmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
|
||||
#define mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
|
||||
|
||||
#include "BluetoothInterface.h"
|
||||
#include "BluetoothCommon.h"
|
||||
@ -228,4 +228,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluedroid_BluetoothHfpManager_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothadapter_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothadapter_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothAdapter_h
|
||||
#define mozilla_dom_bluetooth_BluetoothAdapter_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
@ -417,4 +417,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothAdapter_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothclassofdevice_h
|
||||
#define mozilla_dom_bluetooth_bluetoothclassofdevice_h
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothClassOfDevice_h
|
||||
#define mozilla_dom_bluetooth_BluetoothClassOfDevice_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
@ -90,4 +90,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif // mozilla_dom_bluetooth_bluetoothclassofdevice_h
|
||||
#endif // mozilla_dom_bluetooth_BluetoothClassOfDevice_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothdevice_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothdevice_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothDevice_h
|
||||
#define mozilla_dom_bluetooth_BluetoothDevice_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "mozilla/DOMEventTargetHelper.h"
|
||||
@ -244,4 +244,4 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothDevice_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothdiscoveryhandle_h
|
||||
#define mozilla_dom_bluetooth_bluetoothdiscoveryhandle_h
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothDiscoveryHandle_h
|
||||
#define mozilla_dom_bluetooth_BluetoothDiscoveryHandle_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "mozilla/DOMEventTargetHelper.h"
|
||||
@ -76,4 +76,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif // mozilla_dom_bluetooth_bluetoothdiscoveryhandle_h
|
||||
#endif // mozilla_dom_bluetooth_BluetoothDiscoveryHandle_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothgatt_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothgatt_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothGatt_h
|
||||
#define mozilla_dom_bluetooth_BluetoothGatt_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "mozilla/DOMEventTargetHelper.h"
|
||||
@ -191,4 +191,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothGatt_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothgattcharacteristic_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothgattcharacteristic_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothGattCharacteristic_h
|
||||
#define mozilla_dom_bluetooth_BluetoothGattCharacteristic_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "mozilla/dom/BluetoothGattCharacteristicBinding.h"
|
||||
@ -185,4 +185,4 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothGattCharacteristic_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothgattdescriptor_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothgattdescriptor_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothGattDescriptor_h
|
||||
#define mozilla_dom_bluetooth_BluetoothGattDescriptor_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "mozilla/dom/BluetoothGattDescriptorBinding.h"
|
||||
@ -108,4 +108,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothGattDescriptor_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothgattserver_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothgattserver_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothGattServer_h
|
||||
#define mozilla_dom_bluetooth_BluetoothGattServer_h
|
||||
|
||||
#include "mozilla/dom/BluetoothGattServerBinding.h"
|
||||
#include "mozilla/dom/bluetooth/BluetoothCommon.h"
|
||||
@ -66,4 +66,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothGattServer_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothgattservice_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothgattservice_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothGattService_h
|
||||
#define mozilla_dom_bluetooth_BluetoothGattService_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "mozilla/dom/BluetoothGattServiceBinding.h"
|
||||
@ -179,4 +179,4 @@ public:
|
||||
}
|
||||
};
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothGattService_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothledeviceevent_h
|
||||
#define mozilla_dom_bluetooth_bluetoothledeviceevent_h
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothLeDeviceEvent_h
|
||||
#define mozilla_dom_bluetooth_BluetoothLeDeviceEvent_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "mozilla/ErrorResult.h"
|
||||
@ -61,4 +61,4 @@ public:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif // mozilla_dom_bluetooth_bluetoothledeviceevent_h
|
||||
#endif // mozilla_dom_bluetooth_BluetoothLeDeviceEvent_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothManager_h
|
||||
#define mozilla_dom_bluetooth_BluetoothManager_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
@ -140,4 +140,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothManager_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothpairinghandle_h
|
||||
#define mozilla_dom_bluetooth_bluetoothpairinghandle_h
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothPairingHandle_h
|
||||
#define mozilla_dom_bluetooth_BluetoothPairingHandle_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "nsWrapperCache.h"
|
||||
@ -79,4 +79,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif // mozilla_dom_bluetooth_bluetoothpairinghandle_h
|
||||
#endif // mozilla_dom_bluetooth_BluetoothPairingHandle_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothpairinglistener_h
|
||||
#define mozilla_dom_bluetooth_bluetoothpairinglistener_h
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothPairingListener_h
|
||||
#define mozilla_dom_bluetooth_BluetoothPairingListener_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "mozilla/Attributes.h"
|
||||
@ -68,4 +68,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif // mozilla_dom_bluetooth_bluetoothpairinglistener_h
|
||||
#endif // mozilla_dom_bluetooth_BluetoothPairingListener_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothprofilecontroller_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothprofilecontroller_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothProfileController_h
|
||||
#define mozilla_dom_bluetooth_BluetoothProfileController_h
|
||||
|
||||
#include "BluetoothUuid.h"
|
||||
#include "nsISupportsImpl.h"
|
||||
@ -157,4 +157,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothProfileController_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothreplyrunnable_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothreplyrunnable_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothReplyRunnable_h
|
||||
#define mozilla_dom_bluetooth_BluetoothReplyRunnable_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "BluetoothCommon.h"
|
||||
@ -90,4 +90,4 @@ protected:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothReplyRunnable_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetootheventservice_h__
|
||||
#define mozilla_dom_bluetooth_bluetootheventservice_h__
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothService_h
|
||||
#define mozilla_dom_bluetooth_BluetoothService_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "BluetoothInterface.h"
|
||||
@ -564,4 +564,4 @@ protected:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_BluetoothService_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_ipc_bluetoothchild_h__
|
||||
#define mozilla_dom_bluetooth_ipc_bluetoothchild_h__
|
||||
#ifndef mozilla_dom_bluetooth_ipc_BluetoothChild_h
|
||||
#define mozilla_dom_bluetooth_ipc_BluetoothChild_h
|
||||
|
||||
#include "mozilla/dom/bluetooth/BluetoothCommon.h"
|
||||
|
||||
@ -102,4 +102,4 @@ protected:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif // mozilla_dom_bluetooth_ipc_bluetoothchild_h__
|
||||
#endif // mozilla_dom_bluetooth_ipc_BluetoothChild_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_ipc_bluetoothmessageutils_h__
|
||||
#define mozilla_dom_bluetooth_ipc_bluetoothmessageutils_h__
|
||||
#ifndef mozilla_dom_bluetooth_ipc_BluetoothMessageUtils_h
|
||||
#define mozilla_dom_bluetooth_ipc_BluetoothMessageUtils_h
|
||||
|
||||
#include "mozilla/dom/bluetooth/BluetoothCommon.h"
|
||||
#include "ipc/IPCMessageUtils.h"
|
||||
@ -138,4 +138,4 @@ struct ParamTraits<mozilla::dom::bluetooth::BluetoothGattCharAttribute>
|
||||
|
||||
} // namespace IPC
|
||||
|
||||
#endif // mozilla_dom_bluetooth_ipc_bluetoothmessageutils_h__
|
||||
#endif // mozilla_dom_bluetooth_ipc_BluetoothMessageUtils_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_ipc_bluetoothparent_h__
|
||||
#define mozilla_dom_bluetooth_ipc_bluetoothparent_h__
|
||||
#ifndef mozilla_dom_bluetooth_ipc_BluetoothParent_h
|
||||
#define mozilla_dom_bluetooth_ipc_BluetoothParent_h
|
||||
|
||||
#include "mozilla/dom/bluetooth/BluetoothCommon.h"
|
||||
|
||||
@ -265,4 +265,4 @@ protected:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif // mozilla_dom_bluetooth_ipc_bluetoothparent_h__
|
||||
#endif // mozilla_dom_bluetooth_ipc_BluetoothParent_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_ipc_bluetoothservicechildprocess_h__
|
||||
#define mozilla_dom_bluetooth_ipc_bluetoothservicechildprocess_h__
|
||||
#ifndef mozilla_dom_bluetooth_ipc_BluetoothServiceChildProcess_h
|
||||
#define mozilla_dom_bluetooth_ipc_BluetoothServiceChildProcess_h
|
||||
|
||||
#include "BluetoothService.h"
|
||||
|
||||
@ -295,4 +295,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif // mozilla_dom_bluetooth_ipc_bluetoothservicechildprocess_h__
|
||||
#endif // mozilla_dom_bluetooth_ipc_BluetoothServiceChildProcess_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetootha2dpmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetootha2dpmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluez_BluetoothA2dpManager_h
|
||||
#define mozilla_dom_bluetooth_bluez_BluetoothA2dpManager_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "BluetoothProfileController.h"
|
||||
@ -87,4 +87,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluez_BluetoothA2dpManager_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothdbusservice_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothdbusservice_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluez_BluetoothDBusService_h
|
||||
#define mozilla_dom_bluetooth_bluez_BluetoothDBusService_h
|
||||
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "BluetoothCommon.h"
|
||||
@ -338,4 +338,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluez_BluetoothDBusService_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothhfpmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothhfpmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluez_BluetoothHfpManager_h
|
||||
#define mozilla_dom_bluetooth_bluez_BluetoothHfpManager_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "BluetoothHfpManagerBase.h"
|
||||
@ -230,4 +230,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluez_BluetoothHfpManager_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_bluetoothoppmanager_h__
|
||||
#define mozilla_dom_bluetooth_bluetoothoppmanager_h__
|
||||
#ifndef mozilla_dom_bluetooth_bluez_BluetoothOppManager_h
|
||||
#define mozilla_dom_bluetooth_bluez_BluetoothOppManager_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "BluetoothProfileManagerBase.h"
|
||||
@ -228,4 +228,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluez_BluetoothOppManager_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothSocket_h
|
||||
#define mozilla_dom_bluetooth_BluetoothSocket_h
|
||||
#ifndef mozilla_dom_bluetooth_bluez_BluetoothSocket_h
|
||||
#define mozilla_dom_bluetooth_bluez_BluetoothSocket_h
|
||||
|
||||
#include "BluetoothCommon.h"
|
||||
#include "mozilla/ipc/DataSocket.h"
|
||||
@ -135,4 +135,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluez_BluetoothSocket_h
|
||||
|
||||
@ -4,8 +4,8 @@
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#ifndef mozilla_dom_bluetooth_BluetoothUnixSocketConnector_h
|
||||
#define mozilla_dom_bluetooth_BluetoothUnixSocketConnector_h
|
||||
#ifndef mozilla_dom_bluetooth_bluez_BluetoothUnixSocketConnector_h
|
||||
#define mozilla_dom_bluetooth_bluez_BluetoothUnixSocketConnector_h
|
||||
|
||||
#include <bluetooth/bluetooth.h>
|
||||
#include "BluetoothCommon.h"
|
||||
@ -61,4 +61,4 @@ private:
|
||||
|
||||
END_BLUETOOTH_NAMESPACE
|
||||
|
||||
#endif
|
||||
#endif // mozilla_dom_bluetooth_bluez_BluetoothUnixSocketConnector_h
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user