Bug 513164 - Remove "Manage Addons" from Preferences UI; r=gavin
authorJavi Rueda <leofigueres@yahoo.com>
Mon, 27 Aug 2012 12:45:48 -0400
changeset 105613 39c8939683e805b15d5cb98a310d1be6f62fc6d9
parent 105612 0e99f557ca93a20e192f92f3dd385e65a203177c
child 105614 158ffe78995bd7345f6e160d1de2b206b68d410e
push id55
push usershu@rfrn.org
push dateThu, 30 Aug 2012 01:33:09 +0000
reviewersgavin
bugs513164
milestone17.0a1
Bug 513164 - Remove "Manage Addons" from Preferences UI; r=gavin
browser/components/preferences/in-content/main.js
browser/components/preferences/in-content/main.xul
browser/components/preferences/main.js
browser/components/preferences/main.xul
browser/locales/en-US/chrome/browser/preferences/main.dtd
--- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js
@@ -435,24 +435,16 @@ var gMainPane = {
           return this._folderToIndex(currentDirPref.value);
         }
         return 0;
       break;
     }
   },
 
   /**
-   * Displays the Add-ons Manager.
-   */
-  showAddonsMgr: function ()
-  {
-    openUILinkIn("about:addons", "tab");
-  },
-
-  /**
    * Hide/show the "Show my windows and tabs from last time" option based
    * on the value of the browser.privatebrowsing.autostart pref.
    */
   updateBrowserStartupLastSession: function()
   {
     let pbAutoStartPref = document.getElementById("browser.privatebrowsing.autostart");
     let startupPref = document.getElementById("browser.startup.page");
     let menu = document.getElementById("browserStartupPage");
--- a/browser/components/preferences/in-content/main.xul
+++ b/browser/components/preferences/in-content/main.xul
@@ -161,27 +161,8 @@
               onsynctopreference="return gMainPane.getFolderListPref();"/>
     </hbox>
     <radio id="alwaysAsk"
            value="false"
            label="&alwaysAsk.label;"
            accesskey="&alwaysAsk.accesskey;"/>
   </radiogroup>
 </groupbox>
-
-<hbox class="bottomBox" data-category="paneGeneral" hidden="true">
-  <groupbox id="addonsMgrGroup"
-            orient="horizontal"
-            flex="1">
-    <caption label="&addonsMgr.label;"/>
-
-    <description control="manageAddons"
-#ifdef XP_WIN
-                 flex="1">&manageAddonsDescWin.label;</description>
-#else
-                 flex="1">&manageAddonsDescUnix2.label;</description>
-#endif
-    <button id="manageAddons"
-            label="&manageAddons.label;"
-            accesskey="&manageAddons.accesskey;"
-            oncommand="gMainPane.showAddonsMgr();"/>
-  </groupbox>
-</hbox>
--- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js
@@ -432,24 +432,16 @@ var gMainPane = {
           return this._folderToIndex(currentDirPref.value);
         }
         return 0;
       break;
     }
   },
 
   /**
-   * Displays the Add-ons Manager.
-   */
-  showAddonsMgr: function ()
-  {
-    openUILinkIn("about:addons", "window");
-  },
-
-  /**
    * Hide/show the "Show my windows and tabs from last time" option based
    * on the value of the browser.privatebrowsing.autostart pref.
    */
   updateBrowserStartupLastSession: function()
   {
     let pbAutoStartPref = document.getElementById("browser.privatebrowsing.autostart");
     let startupPref = document.getElementById("browser.startup.page");
     let menu = document.getElementById("browserStartupPage");
--- a/browser/components/preferences/main.xul
+++ b/browser/components/preferences/main.xul
@@ -153,27 +153,11 @@
                   onsynctopreference="return gMainPane.getFolderListPref();"/>
         </hbox>
         <radio id="alwaysAsk" value="false"
                label="&alwaysAsk.label;"
                accesskey="&alwaysAsk.accesskey;"/>
       </radiogroup>
     </groupbox>
 
-    <hbox class="bottomBox">
-      <groupbox id="addonsMgrGroup" orient="horizontal" flex="1">
-        <caption label="&addonsMgr.label;"/>
-
-        <description control="manageAddons"
-#ifdef XP_WIN
-                     flex="1">&manageAddonsDescWin.label;</description>
-#else
-                     flex="1">&manageAddonsDescUnix2.label;</description>
-#endif
-        <button id="manageAddons" label="&manageAddons.label;"
-                accesskey="&manageAddons.accesskey;"
-                oncommand="gMainPane.showAddonsMgr();"/>
-      </groupbox>
-    </hbox>
-
   </prefpane>
 
 </overlay>
--- a/browser/locales/en-US/chrome/browser/preferences/main.dtd
+++ b/browser/locales/en-US/chrome/browser/preferences/main.dtd
@@ -29,14 +29,8 @@
 <!ENTITY saveTo.label "Save files to">
 <!ENTITY saveTo.accesskey "v">
 <!ENTITY chooseFolderWin.label        "Browse…">
 <!ENTITY chooseFolderWin.accesskey    "o">
 <!ENTITY chooseFolderMac.label        "Choose…">
 <!ENTITY chooseFolderMac.accesskey    "e">
 <!ENTITY alwaysAsk.label "Always ask me where to save files">
 <!ENTITY alwaysAsk.accesskey "A">
-
-<!ENTITY addonsMgr.label               "Add-ons">
-<!ENTITY manageAddonsDescWin.label     "Change options for your add-ons">
-<!ENTITY manageAddonsDescUnix2.label   "Change preferences for your add-ons">
-<!ENTITY manageAddons.label            "Manage Add-ons…">
-<!ENTITY manageAddons.accesskey        "M">