From 10fac030150cb89272ee2bafbb68757a3973b982 Mon Sep 17 00:00:00 2001
From: Dave Camp <dcamp@mozilla.com>
Date: Mon, 23 May 2011 13:15:02 -0700
Subject: [PATCH] Backing out aca490d48c95 (Bug 655776) to take care of some
 issues in the patch.

---
 browser/base/content/browser-appmenu.inc         | 3 ---
 browser/base/content/browser-menubar.inc         | 3 ---
 browser/base/content/browser.js                  | 6 ------
 browser/locales/en-US/chrome/browser/browser.dtd | 2 --
 4 files changed, 14 deletions(-)

diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index cab6cafa103e..215076659138 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -201,9 +201,6 @@
                     label="&errorConsoleCmd.label;"
                     key="key_errorConsole"
                     oncommand="toJavaScriptConsole();"/>
-          <menuitem id="appmenu_getMoreDevtools"
-                    label="&getMoreDevtoolsCmd.label;"
-                    oncommand="Devtools.getMoreLink();"/>
           <menuseparator/>
 #define ID_PREFIX appmenu_developer_
 #define OMIT_ACCESSKEYS
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index df102e077c6f..3ce44822be60 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -567,9 +567,6 @@
                             accesskey="&errorConsoleCmd.accesskey;"
                             key="key_errorConsole"
                             oncommand="toJavaScriptConsole();"/>
-                  <menuitem id="getMoreDevtools"
-                            label="&getMoreDevtoolsCmd.label;"
-                            oncommand="Devtools.getMoreLink();"/>
                 </menupopup>
               </menu>
               <menuitem id="menu_pageInfo"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 8bff5e93b47f..2945ebe7ef34 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -8678,12 +8678,6 @@ var Scratchpad = {
   },
 };
 
-var Devtools = {
-  getMoreLink: function Devtools_getMoreLink() {
-    switchToTabHavingURI("https://addons.mozilla.org/en-US/firefox/collections/mozilla/webdeveloper/", true);
-  },
-};
-
 
 XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () {
 #ifdef XP_WIN
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 462a9123af8e..bc4dd094377c 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -226,8 +226,6 @@ can reach it easily. -->
 <!ENTITY inspectObjectButton.label       "Object">
 <!ENTITY inspectObjectButton.accesskey   "O">
 
-<!ENTITY getMoreDevtoolsCmd.label        "Get More Tools…">
-
 <!ENTITY fileMenu.label         "File"> 
 <!ENTITY fileMenu.accesskey       "F">
 <!ENTITY newNavigatorCmd.label        "New Window">