Backed out changeset a1393f2f306e (bug 1209344)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 16 Dec 2015 14:43:53 +0100
changeset 315843 dd4bb6fad8dafc2557bd7835d2a26028b7d21e7a
parent 315842 f8840e2aec5afdebf63216dc219e103b5d4c391a
child 315844 a42ef45dc7217345fbc67d43d74399c8c679e9b2
push id8469
push userbgrinstead@mozilla.com
push dateWed, 16 Dec 2015 19:53:11 +0000
bugs1209344
milestone46.0a1
backs outa1393f2f306ef87ddaf36b8a91d8ac5aa1370134
Backed out changeset a1393f2f306e (bug 1209344)
toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
toolkit/mozapps/extensions/content/extensions.js
toolkit/mozapps/extensions/content/extensions.xul
toolkit/mozapps/extensions/test/browser/browser.ini
toolkit/mozapps/extensions/test/browser/browser_debug_addons.js
--- a/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
+++ b/toolkit/locales/en-US/chrome/mozapps/extensions/extensions.dtd
@@ -20,18 +20,16 @@
 <!ENTITY installAddonFromFile.accesskey       "I">
 <!ENTITY toolsMenu.tooltip                    "Tools for all add-ons">
 
 <!ENTITY cmd.back.tooltip                     "Go back one page">
 <!ENTITY cmd.forward.tooltip                  "Go forward one page">
 
 <!ENTITY showUnsignedExtensions.button.label  "Some extensions could not be verified">
 <!ENTITY showAllExtensions.button.label       "Show all extensions">
-<!ENTITY debugAddons.label                    "Debug Add-ons">
-<!ENTITY debugAddons.accesskey                "B">
 
 <!-- global warnings -->
 <!ENTITY warning.safemode.label                    "All add-ons have been disabled by safe mode.">
 <!ENTITY warning.checkcompatibility.label          "Add-on compatibility checking is disabled. You may have incompatible add-ons.">
 <!ENTITY warning.checkcompatibility.enable.label   "Enable">
 <!ENTITY warning.checkcompatibility.enable.tooltip "Enable add-on compatibility checking">
 <!ENTITY warning.updatesecurity.label              "Add-on update security checking is disabled. You may be compromised by updates.">
 <!ENTITY warning.updatesecurity.enable.label       "Enable">
--- a/toolkit/mozapps/extensions/content/extensions.js
+++ b/toolkit/mozapps/extensions/content/extensions.js
@@ -1275,28 +1275,16 @@ var gViewController = {
             buildNextInstall();
           });
         }
 
         buildNextInstall();
       }
     },
 
-    cmd_debugAddons: {
-      isEnabled: function() {
-        return true;
-      },
-      doCommand: function() {
-        let mainWindow = getMainWindow();
-        if ("switchToTabHavingURI" in mainWindow) {
-          mainWindow.switchToTabHavingURI("about:debugging#addons", true);
-        }
-      },
-    },
-
     cmd_cancelOperation: {
       isEnabled: function(aAddon) {
         if (!aAddon)
           return false;
         return aAddon.pendingOperations != AddonManager.PENDING_NONE;
       },
       doCommand: function(aAddon) {
         if (isPending(aAddon, "install")) {
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -78,17 +78,16 @@
     <!-- XXXsw remove useless oncommand attribute once bug 371900 is fixed -->
     <command id="cmd_focusSearch" oncommand=";"/>
     <command id="cmd_findAllUpdates"/>
     <command id="cmd_restartApp"/>
     <command id="cmd_goToDiscoverPane"/>
     <command id="cmd_goToRecentUpdates"/>
     <command id="cmd_goToAvailableUpdates"/>
     <command id="cmd_installFromFile"/>
-    <command id="cmd_debugAddons"/>
     <command id="cmd_back"/>
     <command id="cmd_forward"/>
     <command id="cmd_enableCheckCompatibility"/>
     <command id="cmd_pluginCheck"/>
     <command id="cmd_enableUpdateSecurity"/>
     <command id="cmd_toggleAutoUpdateDefault"/>
     <command id="cmd_resetAddonAutoUpdate"/>
     <command id="cmd_experimentsLearnMore"/>
@@ -198,20 +197,16 @@
                       label="&updates.viewUpdates.label;"
                       accesskey="&updates.viewUpdates.accesskey;"
                       command="cmd_goToRecentUpdates"/>
             <menuseparator id="utils-installFromFile-separator"/>
             <menuitem id="utils-installFromFile"
                       label="&installAddonFromFile.label;"
                       accesskey="&installAddonFromFile.accesskey;"
                       command="cmd_installFromFile"/>
-            <menuitem id="utils-debugAddons"
-                      label="&debugAddons.label;"
-                      accesskey="&debugAddons.accesskey;"
-                      command="cmd_debugAddons"/>
             <menuseparator/>
             <menuitem id="utils-autoUpdateDefault"
                       label="&updates.updateAddonsAutomatically.label;"
                       accesskey="&updates.updateAddonsAutomatically.accesskey;"
                       type="checkbox" autocheck="false"
                       command="cmd_toggleAutoUpdateDefault"/>
             <menuitem id="utils-resetAddonUpdatesToAutomatic"
                       label="&updates.resetUpdatesToAutomatic.label;"
--- a/toolkit/mozapps/extensions/test/browser/browser.ini
+++ b/toolkit/mozapps/extensions/test/browser/browser.ini
@@ -50,11 +50,10 @@ skip-if = e10s
 skip-if = e10s
 [browser_select_compatoverrides.js]
 [browser_select_confirm.js]
 [browser_select_selection.js]
 [browser_select_update.js]
 [browser_updatessl.js]
 [browser_task_next_test.js]
 [browser_discovery_install.js]
-[browser_debug_addons.js]
 
 [include:browser-common.ini]
deleted file mode 100644
--- a/toolkit/mozapps/extensions/test/browser/browser_debug_addons.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-
-/**
- * Test for bug 1209344 <https://bugzilla.mozilla.org/show_bug.cgi?id=1209344>:
- * Provide link to about:debugging#addons
- */
-
-var gManagerWindow;
-
-const URI_ABOUT_DEBUGGING = "about:debugging#addons";
-
-function test() {
-  waitForExplicitFinish();
-
-  open_manager("addons://list/extension", (aManager) => {
-    gManagerWindow = aManager;
-
-    test_about_debugging(URI_ABOUT_DEBUGGING, () => {
-        close_manager(gManagerWindow, finish);
-    });
-  });
-}
-
-function test_about_debugging(aExpectedAboutUri, aCallback) {
-  info("Waiting for about:debugging tab");
-  gBrowser.tabContainer.addEventListener("TabOpen", function listener(event) {
-    gBrowser.tabContainer.removeEventListener("TabOpen", listener, true);
-    function wantLoad(url) {
-      return url != "about:blank";
-    }
-    BrowserTestUtils.browserLoaded(event.target.linkedBrowser, false, wantLoad).then(() => {
-      is(gBrowser.currentURI.spec, URI_ABOUT_DEBUGGING, "Should have loaded the right page");
-
-      gBrowser.removeCurrentTab();
-
-      if (gUseInContentUI) {
-        is(gBrowser.currentURI.spec, "about:addons", "Should be back to the add-ons manager");
-        run_next_test();
-      }
-      else {
-        waitForFocus(run_next_test, gManagerWindow);
-      }
-    });
-  });
-
-
-  gManagerWindow.gViewController.doCommand("cmd_debugAddons");
-}
-
-function end_test() {
-  close_manager(gManagerWindow, () => {
-    finish();
-  });
-}