зеркало из https://github.com/mozilla/gecko-dev.git
Merge m-c to inbound, a=merge
--HG-- extra : commitid : Lb4DnLIVzwj
This commit is contained in:
Wes Kocher
Коммит
7190595504
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="b89fda71fcd0fa0cf969310e75be3ea33e048b44"/>
|
||||
<project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" revision="2e7d5348f35575870b3c7e567a9a9f6d66f8d6c5"/>
|
||||
<project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" revision="1342fd7b4b000ac3e76a5dfe111a0de9d710b4c8"/>
|
||||
<project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="78948bc4d41c9657d7e2a1a84a21fa2a0eee2504"/>
|
||||
<project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="4bbd73cde5ebfdf6d75e4de83901700a3675b6fe"/>
|
||||
<project groups="linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" revision="1b26ad444462ccbd97f6319565b4735f7bd779e5"/>
|
||||
<project name="device/common" path="device/common" revision="4e1a38704dcfadef60ed2da3cfeba02a56b069d2"/>
|
||||
<project name="device/sample" path="device/sample" revision="b045905b46c8b4ee630d0c2aee7db63eaec722d9"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"git": {
|
||||
"git_revision": "1899109c9fd9b9e2244155c4b9e966c0a48368fc",
|
||||
"git_revision": "9f665863ea9c3dd9585905ef002e8fa06713d820",
|
||||
"remote": "https://git.mozilla.org/releases/gaia.git",
|
||||
"branch": ""
|
||||
},
|
||||
"revision": "cfb223aa835d5bf17ec0fd03f873b6788a149edb",
|
||||
"revision": "9f635ea7f4ca6be790a3912220fbcd5da25cbefa",
|
||||
"repo_path": "integration/gaia-central"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
<project groups="linux" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" path="prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.7-4.6" revision="b89fda71fcd0fa0cf969310e75be3ea33e048b44"/>
|
||||
<project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" path="prebuilts/gcc/linux-x86/arm/arm-eabi-4.7" revision="2e7d5348f35575870b3c7e567a9a9f6d66f8d6c5"/>
|
||||
<project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.7" revision="1342fd7b4b000ac3e76a5dfe111a0de9d710b4c8"/>
|
||||
<project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="78948bc4d41c9657d7e2a1a84a21fa2a0eee2504"/>
|
||||
<project groups="linux,arm" name="platform/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" path="prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9" revision="4bbd73cde5ebfdf6d75e4de83901700a3675b6fe"/>
|
||||
<project groups="linux,x86" name="platform/prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" path="prebuilts/gcc/linux-x86/x86/i686-linux-android-4.7" revision="1b26ad444462ccbd97f6319565b4735f7bd779e5"/>
|
||||
<project name="device/common" path="device/common" revision="4e1a38704dcfadef60ed2da3cfeba02a56b069d2"/>
|
||||
<project name="device/sample" path="device/sample" revision="b045905b46c8b4ee630d0c2aee7db63eaec722d9"/>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<!--
|
||||
B2G repositories for all targets
|
||||
-->
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="1899109c9fd9b9e2244155c4b9e966c0a48368fc"/>
|
||||
<project name="gaia" path="gaia" remote="mozillaorg" revision="9f665863ea9c3dd9585905ef002e8fa06713d820"/>
|
||||
<project name="gonk-misc" path="gonk-misc" remote="b2g" revision="4a962bdab532e18f53e9d2d114c349983262c6b7"/>
|
||||
<project name="moztt" path="external/moztt" remote="b2g" revision="99c333dab00ed79baff9e1cf76b320aee8e1c123"/>
|
||||
<project name="platform_hardware_libhardware_moz" path="hardware/libhardware_moz" remote="b2g" revision="fdf3a143dc777e5f9d33a88373af7ea161d3b440"/>
|
||||
|
|
|
|||
|
|
@ -7923,13 +7923,17 @@ TabModalPromptBox.prototype = {
|
|||
delete this._allowTabFocusByPromptPrincipal;
|
||||
|
||||
let allowFocusCheckbox; // Define outside the if block so we can bind it into the callback.
|
||||
if (principalToAllowFocusFor) {
|
||||
let hostForAllowFocusCheckbox = "";
|
||||
try {
|
||||
hostForAllowFocusCheckbox = principalToAllowFocusFor.URI.host;
|
||||
} catch (ex) { /* Ignore exceptions for host-less URIs */ }
|
||||
if (hostForAllowFocusCheckbox) {
|
||||
let allowFocusRow = document.createElementNS(XUL_NS, "row");
|
||||
allowFocusCheckbox = document.createElementNS(XUL_NS, "checkbox");
|
||||
let spacer = document.createElementNS(XUL_NS, "spacer");
|
||||
allowFocusRow.appendChild(spacer);
|
||||
let label = gBrowser.mStringBundle.getFormattedString("tabs.allowTabFocusByPromptForSite",
|
||||
[principalToAllowFocusFor.URI.host]);
|
||||
[hostForAllowFocusCheckbox]);
|
||||
allowFocusCheckbox.setAttribute("label", label);
|
||||
allowFocusRow.appendChild(allowFocusCheckbox);
|
||||
newPrompt.appendChild(allowFocusRow);
|
||||
|
|
|
|||
|
|
@ -4369,9 +4369,11 @@
|
|||
if (tabForEvent.selected)
|
||||
return;
|
||||
|
||||
// If this is a tabprompt, we won't switch tabs
|
||||
// (unless this behaviour has been disabled entirely using the pref)
|
||||
// If this is a tabprompt, we won't switch tabs, unless:
|
||||
// - this is a beforeunload prompt
|
||||
// - this behaviour has been disabled entirely using the pref
|
||||
if (event.detail && event.detail.tabPrompt &&
|
||||
!event.detail.inPermitUnload &&
|
||||
Services.prefs.getBoolPref("browser.tabs.dontfocusfordialogs")) {
|
||||
let docPrincipal = targetIsWindow ? event.target.document.nodePrincipal : null;
|
||||
// At least one of these should/will be non-null:
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper {
|
|||
pointer-events: auto;
|
||||
}
|
||||
|
||||
.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
|
||||
.tabbrowser-tab:-moz-any([image], [pinned]) > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
|
||||
.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([visuallyselected="true"]) {
|
||||
background-image: var(--pinned-tab-glow);
|
||||
background-position: center;
|
||||
|
|
|
|||
|
|
@ -444,7 +444,7 @@
|
|||
position: absolute;
|
||||
}
|
||||
|
||||
.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
|
||||
.tabbrowser-tab:-moz-any([image], [pinned]) > .tab-stack > .tab-content[attention]:not([visuallyselected="true"]),
|
||||
.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([visuallyselected="true"]) {
|
||||
background-image: radial-gradient(farthest-corner at center bottom, rgb(255,255,255) 3%, rgba(186,221,251,0.75) 20%, rgba(127,179,255,0.25) 40%, transparent 70%);
|
||||
background-position: center bottom var(--tab-toolbar-navbar-overlap);
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
"use strict";
|
||||
|
||||
const { reportException, assert } = require("devtools/shared/DevToolsUtils");
|
||||
const { immutableUpdate, reportException, assert } = require("devtools/shared/DevToolsUtils");
|
||||
const { snapshotState: states, actions } = require("../constants");
|
||||
const { immutableUpdate, L10N, openFilePicker, createSnapshot } = require("../utils");
|
||||
const { L10N, openFilePicker, createSnapshot } = require("../utils");
|
||||
const { readSnapshot, takeCensus, selectSnapshot } = require("./snapshot");
|
||||
const { OS } = require("resource://gre/modules/osfile.jsm");
|
||||
const VALID_EXPORT_STATES = [states.SAVED, states.READ, states.SAVING_CENSUS, states.SAVED_CENSUS];
|
||||
|
|
|
|||
|
|
@ -3,9 +3,9 @@
|
|||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
"use strict";
|
||||
|
||||
const { assert } = require("devtools/shared/DevToolsUtils");
|
||||
const { immutableUpdate, assert } = require("devtools/shared/DevToolsUtils");
|
||||
const { actions, diffingState } = require("../constants");
|
||||
const { immutableUpdate, snapshotIsDiffable } = require("../utils");
|
||||
const { snapshotIsDiffable } = require("../utils");
|
||||
|
||||
const handlers = Object.create(null);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
"use strict";
|
||||
|
||||
const { immutableUpdate } = require("devtools/shared/DevToolsUtils");
|
||||
const { actions, snapshotState: states } = require("../constants");
|
||||
const { immutableUpdate } = require("../utils");
|
||||
|
||||
const handlers = Object.create(null);
|
||||
|
||||
|
|
|
|||
|
|
@ -16,10 +16,6 @@ const CUSTOM_BREAKDOWN_PREF = "devtools.memory.custom-breakdowns";
|
|||
const DevToolsUtils = require("devtools/shared/DevToolsUtils");
|
||||
const { snapshotState: states, diffingState, breakdowns } = require("./constants");
|
||||
|
||||
exports.immutableUpdate = function (...objs) {
|
||||
return Object.freeze(Object.assign({}, ...objs));
|
||||
};
|
||||
|
||||
/**
|
||||
* Takes a snapshot object and returns the
|
||||
* localized form of its timestamp to be used as a title.
|
||||
|
|
|
|||
|
|
@ -14,6 +14,12 @@ loader.lazyRequireGetter(this, "FileUtils",
|
|||
"resource://gre/modules/FileUtils.jsm", true);
|
||||
loader.lazyRequireGetter(this, "setTimeout", "Timer", true);
|
||||
|
||||
// Re-export the thread-safe utils.
|
||||
const ThreadSafeDevToolsUtils = require("./ThreadSafeDevToolsUtils.js");
|
||||
for (let key of Object.keys(ThreadSafeDevToolsUtils)) {
|
||||
exports[key] = ThreadSafeDevToolsUtils[key];
|
||||
}
|
||||
|
||||
/**
|
||||
* Turn the error |aError| into a string, without fail.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,35 @@
|
|||
/* 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/. */
|
||||
|
||||
"use strict";
|
||||
|
||||
/**
|
||||
* General utilities used throughout devtools that can also be used in
|
||||
* workers.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Immutably reduce the given `...objs` into one object. The reduction is
|
||||
* applied from left to right, so `immutableUpdate({ a: 1 }, { a: 2 })` will
|
||||
* result in `{ a: 2 }`. The resulting object is frozen.
|
||||
*
|
||||
* Example usage:
|
||||
*
|
||||
* const original = { foo: 1, bar: 2, baz: 3 };
|
||||
* const modified = immutableUpdate(original, { baz: 0, bang: 4 });
|
||||
*
|
||||
* // We get the new object that we expect...
|
||||
* assert(modified.baz === 0);
|
||||
* assert(modified.bang === 4);
|
||||
*
|
||||
* // However, the original is not modified.
|
||||
* assert(original.baz === 2);
|
||||
* assert(original.bang === undefined);
|
||||
*
|
||||
* @param {...Object} ...objs
|
||||
* @returns {Object}
|
||||
*/
|
||||
exports.immutableUpdate = function (...objs) {
|
||||
return Object.freeze(Object.assign({}, ...objs));
|
||||
};
|
||||
|
|
@ -49,4 +49,5 @@ DevToolsModules(
|
|||
'Parser.jsm',
|
||||
'path.js',
|
||||
'system.js',
|
||||
'ThreadSafeDevToolsUtils.js',
|
||||
)
|
||||
|
|
|
|||
|
|
@ -600,10 +600,16 @@ var BrowserApp = {
|
|||
|
||||
if (AppConstants.NIGHTLY_BUILD) {
|
||||
InitLater(() => ShumwayUtils.init(), window, "ShumwayUtils");
|
||||
InitLater(() => Telemetry.addData("FENNEC_TRACKING_PROTECTION_STATE", parseInt(BrowserApp.getTrackingProtectionState())));
|
||||
InitLater(() => WebcompatReporter.init());
|
||||
}
|
||||
|
||||
// Collect telemetry data.
|
||||
// We do this at startup because we want to move away from "gather-telemetry" (bug 1127907)
|
||||
InitLater(() => {
|
||||
Telemetry.addData("FENNEC_TRACKING_PROTECTION_STATE", parseInt(BrowserApp.getTrackingProtectionState()));
|
||||
Telemetry.addData("ZOOMED_VIEW_ENABLED", Services.prefs.getBoolPref("ui.zoomedview.enabled"));
|
||||
});
|
||||
|
||||
InitLater(() => LightWeightThemeWebInstaller.init());
|
||||
InitLater(() => SpatialNavigation.init(BrowserApp.deck, null), window, "SpatialNavigation");
|
||||
InitLater(() => CastingApps.init(), window, "CastingApps");
|
||||
|
|
|
|||
|
|
@ -50,7 +50,8 @@ category update-timer WebappsUpdateTimer @mozilla.org/webapps-update-timer;1,get
|
|||
component {9a61149b-2276-4a0a-b79c-be994ad106cf} PromptService.js
|
||||
contract @mozilla.org/prompter;1 {9a61149b-2276-4a0a-b79c-be994ad106cf}
|
||||
contract @mozilla.org/embedcomp/prompt-service;1 {9a61149b-2276-4a0a-b79c-be994ad106cf}
|
||||
category wakeup-request PromptService @mozilla.org/embedcomp/prompt-service;1,nsIPromptService,getService,Prompt:Call
|
||||
component {80dae1e9-e0d2-4974-915f-f97050fa8068} PromptService.js
|
||||
contract @mozilla.org/network/authprompt-adapter-factory;1 {80dae1e9-e0d2-4974-915f-f97050fa8068}
|
||||
#endif
|
||||
|
||||
# ImageBlockingPolicy.js
|
||||
|
|
|
|||
|
|
@ -26,40 +26,29 @@ PromptService.prototype = {
|
|||
/* ---------- nsIPromptFactory ---------- */
|
||||
// XXX Copied from nsPrompter.js.
|
||||
getPrompt: function getPrompt(domWin, iid) {
|
||||
let doc = this.getDocument();
|
||||
if (!doc) {
|
||||
let fallback = this._getFallbackService();
|
||||
return fallback.QueryInterface(Ci.nsIPromptFactory).getPrompt(domWin, iid);
|
||||
// This is still kind of dumb; the C++ code delegated to login manager
|
||||
// here, which in turn calls back into us via nsIPromptService2.
|
||||
if (iid.equals(Ci.nsIAuthPrompt2) || iid.equals(Ci.nsIAuthPrompt)) {
|
||||
try {
|
||||
let pwmgr = Cc["@mozilla.org/passwordmanager/authpromptfactory;1"].getService(Ci.nsIPromptFactory);
|
||||
return pwmgr.getPrompt(domWin, iid);
|
||||
} catch (e) {
|
||||
Cu.reportError("nsPrompter: Delegation to password manager failed: " + e);
|
||||
}
|
||||
}
|
||||
|
||||
let p = new InternalPrompt(domWin, doc);
|
||||
let p = new InternalPrompt(domWin);
|
||||
p.QueryInterface(iid);
|
||||
return p;
|
||||
},
|
||||
|
||||
/* ---------- private memebers ---------- */
|
||||
|
||||
_getFallbackService: function _getFallbackService() {
|
||||
return Components.classesByID["{7ad1b327-6dfa-46ec-9234-f2a620ea7e00}"]
|
||||
.getService(Ci.nsIPromptService);
|
||||
},
|
||||
|
||||
getDocument: function getDocument() {
|
||||
let win = Services.wm.getMostRecentWindow("navigator:browser");
|
||||
return win ? win.document : null;
|
||||
},
|
||||
|
||||
// nsIPromptService and nsIPromptService2 methods proxy to our Prompt class
|
||||
// if we can show in-document popups, or to the fallback service otherwise.
|
||||
callProxy: function(aMethod, aArguments) {
|
||||
let prompt;
|
||||
let doc = this.getDocument();
|
||||
if (!doc) {
|
||||
let fallback = this._getFallbackService();
|
||||
return fallback[aMethod].apply(fallback, aArguments);
|
||||
}
|
||||
let domWin = aArguments[0];
|
||||
prompt = new InternalPrompt(domWin, doc);
|
||||
prompt = new InternalPrompt(domWin);
|
||||
return prompt[aMethod].apply(prompt, Array.prototype.slice.call(aArguments, 1));
|
||||
},
|
||||
|
||||
|
|
@ -102,14 +91,12 @@ PromptService.prototype = {
|
|||
}
|
||||
};
|
||||
|
||||
function InternalPrompt(aDomWin, aDocument) {
|
||||
function InternalPrompt(aDomWin) {
|
||||
this._domWin = aDomWin;
|
||||
this._doc = aDocument;
|
||||
}
|
||||
|
||||
InternalPrompt.prototype = {
|
||||
_domWin: null,
|
||||
_doc: null,
|
||||
|
||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsIPrompt, Ci.nsIAuthPrompt, Ci.nsIAuthPrompt2]),
|
||||
|
||||
|
|
@ -373,11 +360,11 @@ InternalPrompt.prototype = {
|
|||
return this.nsIPrompt_prompt(title, text, result, null, {});
|
||||
},
|
||||
|
||||
nsIAuthPrompt_promptUsernameAndPassword : function (aTitle, aText, aPasswordRealm, aSavePassword, aUser, aPass) {
|
||||
nsIAuthPrompt_promptUsernameAndPassword : function(aTitle, aText, aPasswordRealm, aSavePassword, aUser, aPass) {
|
||||
return this.nsIAuthPrompt_loginPrompt(aTitle, aText, aPasswordRealm, aSavePassword, aUser, aPass);
|
||||
},
|
||||
|
||||
nsIAuthPrompt_promptPassword : function (aTitle, aText, aPasswordRealm, aSavePassword, aPass) {
|
||||
nsIAuthPrompt_promptPassword : function(aTitle, aText, aPasswordRealm, aSavePassword, aPass) {
|
||||
return this.nsIAuthPrompt_loginPrompt(aTitle, aText, aPasswordRealm, aSavePassword, null, aPass);
|
||||
},
|
||||
|
||||
|
|
@ -828,4 +815,59 @@ XPCOMUtils.defineLazyGetter(PromptUtils, "bundle", function () {
|
|||
return Services.strings.createBundle("chrome://global/locale/commonDialogs.properties");
|
||||
});
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PromptService]);
|
||||
|
||||
// Factory for wrapping nsIAuthPrompt interfaces to make them usable via an nsIAuthPrompt2 interface.
|
||||
// XXX Copied from nsPrompter.js.
|
||||
function AuthPromptAdapterFactory() {
|
||||
}
|
||||
|
||||
AuthPromptAdapterFactory.prototype = {
|
||||
classID: Components.ID("{80dae1e9-e0d2-4974-915f-f97050fa8068}"),
|
||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPromptAdapterFactory]),
|
||||
|
||||
/* ---------- nsIAuthPromptAdapterFactory ---------- */
|
||||
|
||||
createAdapter: function(aPrompt) {
|
||||
return new AuthPromptAdapter(aPrompt);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
// Takes an nsIAuthPrompt implementation, wraps it with a nsIAuthPrompt2 shell.
|
||||
// XXX Copied from nsPrompter.js.
|
||||
function AuthPromptAdapter(aPrompt) {
|
||||
this.prompt = aPrompt;
|
||||
}
|
||||
|
||||
AuthPromptAdapter.prototype = {
|
||||
QueryInterface: XPCOMUtils.generateQI([Ci.nsIAuthPrompt2]),
|
||||
prompt: null,
|
||||
|
||||
/* ---------- nsIAuthPrompt2 ---------- */
|
||||
|
||||
promptAuth: function(aChannel, aLevel, aAuthInfo, aCheckLabel, aCheckValue) {
|
||||
let message = PromptUtils.makeDialogText(aChannel, aAuthInfo);
|
||||
|
||||
let [username, password] = PromptUtils.getAuthInfo(aAuthInfo);
|
||||
let [host, realm] = PromptUtils.getAuthTarget(aChannel, aAuthInfo);
|
||||
let authTarget = host + " (" + realm + ")";
|
||||
|
||||
let ok;
|
||||
if (aAuthInfo.flags & Ci.nsIAuthInformation.ONLY_PASSWORD) {
|
||||
ok = this.prompt.promptPassword(null, message, authTarget, Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY, password);
|
||||
} else {
|
||||
ok = this.prompt.promptUsernameAndPassword(null, message, authTarget, Ci.nsIAuthPrompt.SAVE_PASSWORD_PERMANENTLY, username, password);
|
||||
}
|
||||
|
||||
if (ok) {
|
||||
PromptUtils.setAuthInfo(aAuthInfo, username.value, password.value);
|
||||
}
|
||||
return ok;
|
||||
},
|
||||
|
||||
asyncPromptAuth: function(aChannel, aCallback, aContext, aLevel, aAuthInfo, aCheckLabel, aCheckValue) {
|
||||
throw Cr.NS_ERROR_NOT_IMPLEMENTED;
|
||||
}
|
||||
};
|
||||
|
||||
this.NSGetFactory = XPCOMUtils.generateNSGetFactory([PromptService, AuthPromptAdapterFactory]);
|
||||
|
|
|
|||
|
|
@ -18,11 +18,6 @@
|
|||
@BINPATH@/chrome/@AB_CD@@JAREXT@
|
||||
@BINPATH@/chrome/@AB_CD@.manifest
|
||||
@BINPATH@/@PREF_DIR@/mobile-l10n.js
|
||||
@BINPATH@/searchplugins/*
|
||||
@BINPATH@/defaults/profile/bookmarks.html
|
||||
@BINPATH@/defaults/profile/localstore.rdf
|
||||
@BINPATH@/defaults/profile/mimeTypes.rdf
|
||||
@BINPATH@/defaults/profile/chrome/*
|
||||
#ifdef MOZ_UPDATER
|
||||
@BINPATH@/update.locale
|
||||
@BINPATH@/updater.ini
|
||||
|
|
@ -81,31 +76,15 @@
|
|||
@BINPATH@/@MOZ_CHILD_PROCESS_NAME_PIE@
|
||||
|
||||
[xpcom]
|
||||
@BINPATH@/dependentlibs.list
|
||||
|
||||
@BINPATH@/AndroidManifest.xml
|
||||
@BINPATH@/resources.arsc
|
||||
@BINPATH@/package-name.txt
|
||||
@BINPATH@/classes.dex
|
||||
@BINPATH@/res/drawable
|
||||
@BINPATH@/res/drawable-hdpi
|
||||
@BINPATH@/res/layout
|
||||
@BINPATH@/distribution/*
|
||||
|
||||
[browser]
|
||||
; [Base Browser Files]
|
||||
#ifndef XP_UNIX
|
||||
@BINPATH@/@MOZ_APP_NAME@.exe
|
||||
#else
|
||||
@BINPATH@/@MOZ_APP_NAME@-bin
|
||||
@BINPATH@/@MOZ_APP_NAME@
|
||||
#endif
|
||||
@BINPATH@/application.ini
|
||||
@BINPATH@/platform.ini
|
||||
@BINPATH@/blocklist.xml
|
||||
#ifdef XP_UNIX
|
||||
@BINPATH@/run-mozilla.sh
|
||||
#endif
|
||||
|
||||
; [Components]
|
||||
@BINPATH@/components/components.manifest
|
||||
|
|
@ -117,11 +96,8 @@
|
|||
@BINPATH@/components/appstartup.xpt
|
||||
@BINPATH@/components/autocomplete.xpt
|
||||
@BINPATH@/components/autoconfig.xpt
|
||||
@BINPATH@/components/browsercompsbase.xpt
|
||||
@BINPATH@/components/browser-element.xpt
|
||||
@BINPATH@/components/browser-feeds.xpt
|
||||
@BINPATH@/components/caps.xpt
|
||||
@BINPATH@/components/chardet.xpt
|
||||
@BINPATH@/components/chrome.xpt
|
||||
@BINPATH@/components/commandhandler.xpt
|
||||
@BINPATH@/components/commandlines.xpt
|
||||
|
|
@ -164,10 +140,8 @@
|
|||
@BINPATH@/components/dom_storage.xpt
|
||||
@BINPATH@/components/dom_stylesheets.xpt
|
||||
@BINPATH@/components/dom_system.xpt
|
||||
@BINPATH@/components/dom_threads.xpt
|
||||
@BINPATH@/components/dom_traversal.xpt
|
||||
@BINPATH@/components/dom_tv.xpt
|
||||
@BINPATH@/components/dom_views.xpt
|
||||
#ifdef MOZ_WEBSPEECH
|
||||
@BINPATH@/components/dom_webspeechrecognition.xpt
|
||||
#endif
|
||||
|
|
@ -187,7 +161,6 @@
|
|||
@BINPATH@/components/fastfind.xpt
|
||||
@BINPATH@/components/feeds.xpt
|
||||
@BINPATH@/components/find.xpt
|
||||
@BINPATH@/components/fuel.xpt
|
||||
@BINPATH@/components/gfx.xpt
|
||||
@BINPATH@/components/html5.xpt
|
||||
@BINPATH@/components/htmlparser.xpt
|
||||
|
|
@ -209,7 +182,6 @@
|
|||
#ifdef MOZ_ENABLE_PROFILER_SPS
|
||||
@BINPATH@/components/memory_profiler.xpt
|
||||
#endif
|
||||
@BINPATH@/components/migration.xpt
|
||||
@BINPATH@/components/mimetype.xpt
|
||||
@BINPATH@/components/mozfind.xpt
|
||||
@BINPATH@/components/necko_about.xpt
|
||||
|
|
@ -226,7 +198,9 @@
|
|||
@BINPATH@/components/necko_strconv.xpt
|
||||
@BINPATH@/components/necko_viewsource.xpt
|
||||
@BINPATH@/components/necko_websocket.xpt
|
||||
#ifdef NECKO_WIFI
|
||||
@BINPATH@/components/necko_wifi.xpt
|
||||
#endif
|
||||
@BINPATH@/components/necko_wyciwyg.xpt
|
||||
@BINPATH@/components/necko.xpt
|
||||
@BINPATH@/components/loginmgr.xpt
|
||||
|
|
@ -240,14 +214,11 @@
|
|||
#ifdef MOZ_ENABLE_PROFILER_SPS
|
||||
@BINPATH@/components/profiler.xpt
|
||||
#endif
|
||||
@BINPATH@/components/proxyObject.xpt
|
||||
@BINPATH@/components/rdf.xpt
|
||||
@BINPATH@/components/satchel.xpt
|
||||
@BINPATH@/components/saxparser.xpt
|
||||
@BINPATH@/components/sessionstore.xpt
|
||||
@BINPATH@/components/services-crypto-component.xpt
|
||||
@BINPATH@/components/captivedetect.xpt
|
||||
@BINPATH@/components/shellservice.xpt
|
||||
@BINPATH@/components/shistory.xpt
|
||||
@BINPATH@/components/spellchecker.xpt
|
||||
@BINPATH@/components/storage.xpt
|
||||
|
|
@ -274,7 +245,6 @@
|
|||
@BINPATH@/components/urlformatter.xpt
|
||||
@BINPATH@/components/webBrowser_core.xpt
|
||||
@BINPATH@/components/webbrowserpersist.xpt
|
||||
@BINPATH@/components/webshell_idls.xpt
|
||||
@BINPATH@/components/widget.xpt
|
||||
@BINPATH@/components/widget_android.xpt
|
||||
@BINPATH@/components/windowds.xpt
|
||||
|
|
@ -316,38 +286,23 @@
|
|||
@BINPATH@/components/FeedProcessor.js
|
||||
@BINPATH@/components/PackagedAppUtils.manifest
|
||||
@BINPATH@/components/PackagedAppUtils.js
|
||||
@BINPATH@/components/BrowserFeeds.manifest
|
||||
@BINPATH@/components/FeedConverter.js
|
||||
@BINPATH@/components/FeedWriter.js
|
||||
@BINPATH@/components/PermissionSettings.js
|
||||
@BINPATH@/components/PermissionSettings.manifest
|
||||
@BINPATH@/components/PermissionPromptService.js
|
||||
@BINPATH@/components/PermissionPromptService.manifest
|
||||
@BINPATH@/components/fuelApplication.manifest
|
||||
@BINPATH@/components/fuelApplication.js
|
||||
@BINPATH@/components/WebContentConverter.js
|
||||
@BINPATH@/components/BrowserComponents.manifest
|
||||
@BINPATH@/components/nsBrowserContentHandler.js
|
||||
@BINPATH@/components/nsBrowserGlue.js
|
||||
@BINPATH@/components/nsDNSServiceDiscovery.manifest
|
||||
@BINPATH@/components/nsDNSServiceDiscovery.js
|
||||
@BINPATH@/components/nsSetDefaultBrowser.manifest
|
||||
@BINPATH@/components/nsSetDefaultBrowser.js
|
||||
@BINPATH@/components/toolkitsearch.manifest
|
||||
@BINPATH@/components/nsSearchService.js
|
||||
@BINPATH@/components/nsSearchSuggestions.js
|
||||
@BINPATH@/components/nsSidebar.js
|
||||
@BINPATH@/components/passwordmgr.manifest
|
||||
@BINPATH@/components/nsLoginInfo.js
|
||||
@BINPATH@/components/nsLoginManager.js
|
||||
@BINPATH@/components/nsLoginManagerPrompter.js
|
||||
@BINPATH@/components/storage-mozStorage.js
|
||||
@BINPATH@/components/crypto-SDR.js
|
||||
@BINPATH@/components/nsHelperAppDlg.manifest
|
||||
@BINPATH@/components/nsHelperAppDlg.js
|
||||
@BINPATH@/components/NetworkGeolocationProvider.manifest
|
||||
@BINPATH@/components/NetworkGeolocationProvider.js
|
||||
@BINPATH@/components/nsSidebar.manifest
|
||||
@BINPATH@/components/nsSidebar.js
|
||||
@BINPATH@/components/extensions.manifest
|
||||
@BINPATH@/components/addonManager.js
|
||||
@BINPATH@/components/amContentHandler.js
|
||||
|
|
@ -372,18 +327,12 @@
|
|||
@BINPATH@/components/ProcessSingleton.manifest
|
||||
@BINPATH@/components/MainProcessSingleton.js
|
||||
@BINPATH@/components/ContentProcessSingleton.js
|
||||
@BINPATH@/components/nsSessionStore.manifest
|
||||
@BINPATH@/components/nsSessionStartup.js
|
||||
@BINPATH@/components/nsSessionStore.js
|
||||
@BINPATH@/components/nsURLFormatter.manifest
|
||||
@BINPATH@/components/nsURLFormatter.js
|
||||
@BINPATH@/components/@DLL_PREFIX@browsercomps@DLL_SUFFIX@
|
||||
@BINPATH@/components/txEXSLTRegExFunctions.manifest
|
||||
@BINPATH@/components/txEXSLTRegExFunctions.js
|
||||
@BINPATH@/components/nsContentPrefService.manifest
|
||||
@BINPATH@/components/nsContentPrefService.js
|
||||
@BINPATH@/components/nsContentDispatchChooser.manifest
|
||||
@BINPATH@/components/nsContentDispatchChooser.js
|
||||
@BINPATH@/components/nsHandlerService.manifest
|
||||
@BINPATH@/components/nsHandlerService.js
|
||||
@BINPATH@/components/nsWebHandlerApp.manifest
|
||||
|
|
@ -404,8 +353,6 @@
|
|||
@BINPATH@/components/messageWakeupService.manifest
|
||||
@BINPATH@/components/nsINIProcessor.manifest
|
||||
@BINPATH@/components/nsINIProcessor.js
|
||||
@BINPATH@/components/nsPrompter.manifest
|
||||
@BINPATH@/components/nsPrompter.js
|
||||
@BINPATH@/components/servicesComponents.manifest
|
||||
@BINPATH@/components/TelemetryStartup.js
|
||||
@BINPATH@/components/TelemetryStartup.manifest
|
||||
|
|
@ -438,11 +385,6 @@
|
|||
@BINPATH@/components/PeerConnection.manifest
|
||||
#endif
|
||||
|
||||
#ifdef MOZ_SERVICES_HEALTHREPORT
|
||||
@BINPATH@/components/HealthReportComponents.manifest
|
||||
@BINPATH@/components/HealthReportService.js
|
||||
#endif
|
||||
|
||||
@BINPATH@/components/CaptivePortalDetectComponents.manifest
|
||||
@BINPATH@/components/captivedetect.js
|
||||
|
||||
|
|
@ -493,39 +435,24 @@
|
|||
@BINPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
|
||||
|
||||
; [Browser Chrome Files]
|
||||
@BINPATH@/chrome/browser@JAREXT@
|
||||
@BINPATH@/chrome/browser.manifest
|
||||
#ifdef NIGHTLY_BUILD
|
||||
@BINPATH@/chrome/shumway.manifest
|
||||
@BINPATH@/chrome/shumway/*
|
||||
#endif
|
||||
@BINPATH@/chrome/toolkit@JAREXT@
|
||||
@BINPATH@/chrome/toolkit.manifest
|
||||
#ifdef XP_UNIX
|
||||
@BINPATH@/chrome/icons/default/default16.png
|
||||
@BINPATH@/chrome/icons/default/default32.png
|
||||
@BINPATH@/chrome/icons/default/default48.png
|
||||
#endif
|
||||
|
||||
; DevTools
|
||||
@BINPATH@/chrome/devtools@JAREXT@
|
||||
@BINPATH@/chrome/devtools.manifest
|
||||
|
||||
; shell icons
|
||||
#ifdef XP_UNIX
|
||||
@BINPATH@/icons/*.xpm
|
||||
@BINPATH@/icons/*.png
|
||||
#endif
|
||||
|
||||
; [Default Preferences]
|
||||
; All the pref files must be part of base to prevent migration bugs
|
||||
@BINPATH@/@PREF_DIR@/mobile.js
|
||||
@BINPATH@/@PREF_DIR@/mobile-branding.js
|
||||
@BINPATH@/@PREF_DIR@/channel-prefs.js
|
||||
@BINPATH@/ua-update.json
|
||||
@BINPATH@/greprefs.js
|
||||
@BINPATH@/defaults/autoconfig/prefcalls.js
|
||||
@BINPATH@/defaults/profile/prefs.js
|
||||
|
||||
; [Layout Engine Resources]
|
||||
; Style Sheets, Graphics and other Resources used by the layout engine.
|
||||
|
|
@ -585,7 +512,6 @@
|
|||
|
||||
; [Personal Security Manager]
|
||||
;
|
||||
@BINPATH@/components/pipboot.xpt
|
||||
@BINPATH@/components/pipnss.xpt
|
||||
|
||||
; For process sandboxing
|
||||
|
|
@ -593,22 +519,6 @@
|
|||
@BINPATH@/@DLL_PREFIX@mozsandbox@DLL_SUFFIX@
|
||||
#endif
|
||||
|
||||
; for Solaris SPARC
|
||||
#ifdef SOLARIS
|
||||
bin/libfreebl_32fpu_3.chk
|
||||
bin/libfreebl_32fpu_3.so
|
||||
bin/libfreebl_32int_3.chk
|
||||
bin/libfreebl_32int_3.so
|
||||
bin/libfreebl_32int64_3.chk
|
||||
bin/libfreebl_32int64_3.so
|
||||
#endif
|
||||
|
||||
; [Updater]
|
||||
;
|
||||
#ifdef MOZ_UPDATER
|
||||
@BINPATH@/updater@BIN_SUFFIX@
|
||||
#endif
|
||||
|
||||
; [Crash Reporter]
|
||||
; CrashService is not used on Android but the ini files are required for L10N
|
||||
; strings, see bug 1191351.
|
||||
|
|
@ -618,7 +528,6 @@ bin/libfreebl_32int64_3.so
|
|||
#endif
|
||||
|
||||
[mobile]
|
||||
@BINPATH@/chrome/icons/
|
||||
@BINPATH@/chrome/chrome@JAREXT@
|
||||
@BINPATH@/chrome/chrome.manifest
|
||||
@BINPATH@/components/AboutRedirector.js
|
||||
|
|
@ -638,7 +547,6 @@ bin/libfreebl_32int64_3.so
|
|||
@BINPATH@/components/NSSDialogService.js
|
||||
@BINPATH@/components/PromptService.js
|
||||
@BINPATH@/components/SessionStore.js
|
||||
@BINPATH@/components/Sidebar.js
|
||||
@BINPATH@/components/SiteSpecificUserAgent.js
|
||||
@BINPATH@/components/Snippets.js
|
||||
|
||||
|
|
@ -649,11 +557,7 @@ bin/libfreebl_32int64_3.so
|
|||
@BINPATH@/components/PaymentsUI.js
|
||||
@BINPATH@/components/PaymentProviderStrategy.js
|
||||
|
||||
#ifdef MOZ_SAFE_BROWSING
|
||||
@BINPATH@/components/SafeBrowsing.jsm
|
||||
#endif
|
||||
@BINPATH@/components/XPIDialogService.js
|
||||
@BINPATH@/components/browsercomps.xpt
|
||||
|
||||
#ifdef ENABLE_MARIONETTE
|
||||
@BINPATH@/chrome/marionette@JAREXT@
|
||||
|
|
|
|||
|
|
@ -480,6 +480,7 @@ function openRemotePrompt(domWin, args, tabPrompt) {
|
|||
let promptPrincipal = domWin.document.nodePrincipal;
|
||||
args.promptPrincipal = promptPrincipal;
|
||||
args.showAlertOrigin = topPrincipal.equals(promptPrincipal);
|
||||
args.inPermitUnload = inPermitUnload;
|
||||
|
||||
args._remoteId = id;
|
||||
|
||||
|
|
|
|||
|
|
@ -8209,6 +8209,13 @@
|
|||
"description": "Whether or not a user has tap-to-load enabled.",
|
||||
"bug_numbers": [1208167]
|
||||
},
|
||||
"ZOOMED_VIEW_ENABLED": {
|
||||
"expires_in_version": "50",
|
||||
"kind": "boolean",
|
||||
"description": "Whether or not a user has the zoomed view (a.k.a. \"Magnify small areas\") enabled.",
|
||||
"alert_emails": ["mobile-frontend@mozilla.com"],
|
||||
"bug_numbers": [1235061]
|
||||
},
|
||||
"TRACKING_PROTECTION_ENABLED": {
|
||||
"expires_in_version": "never",
|
||||
"kind": "boolean",
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче