Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-22 01:35:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 7a05ac03465c (bug 1539598) for turning bug 1531406 into perma on a CLOSED TREE

Browse Source
This commit is contained in:
Oana Pop Rus 2019-04-04 15:35:04 +03:00
parent 7f3884edcd
commit 046e28ecbd
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
toolkit/mozapps/extensions/AddonManager.jsm
View File

@ -2540,7 +2540,7 @@ var AddonManagerInternal = {
// precedence.
// If this add-on is not a webextension or if the application does not
// implement permission prompts, no confirmation is displayed for
// installs created from about:addons (in which case requireConfirm
// installs created with mozAddonManager (in which case requireConfirm
// is false).
// In the remaining cases, a confirmation prompt is displayed but the
// application may override it either by implementing the
@ -2705,12 +2705,7 @@ var AddonManagerInternal = {
method: "amWebAPI",
},
}).then(install => {
let requireConfirm = true;
if (target.contentDocument &&
target.contentDocument.nodePrincipal.isSystemPrincipal) {
requireConfirm = false;
}
AddonManagerInternal.setupPromptHandler(target, null, install, requireConfirm, "AMO");
AddonManagerInternal.setupPromptHandler(target, null, install, false, "AMO");
let id = this.nextInstall++;
let {listener, installPromise} = makeListener(id, target.messageManager);

7
toolkit/mozapps/extensions/test/browser/browser_webapi_theme.js
View File

@ -21,11 +21,6 @@ add_task(async function test_theme_install() {
Services.obs.removeObserver(observer, "lightweight-theme-styling-update");
});
let sawConfirm = false;
promisePopupNotificationShown("addon-install-confirmation").then(panel => {
sawConfirm = true;
panel.button.click();
});
let prompt1 = waitAppMenuNotificationShown("addon-installed", "theme@tests.mozilla.org", false);
let installPromise = ContentTask.spawn(browser, URL, async (url) => {
@ -34,8 +29,6 @@ add_task(async function test_theme_install() {
});
await prompt1;
ok(sawConfirm, "Confirm notification was displayed before installation");
// Open a new window and test the app menu panel from there. This verifies the
// incognito checkbox as well as finishing install in this case.
let newWin = await BrowserTestUtils.openNewBrowserWindow();