summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 06:36:08 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-15 06:36:08 +0000
commit83fe23a3ff26c5dea371ce94f6a909c4d081b145 (patch)
tree5117b7c3928d608f51f31a3279997e2716db6110 /chrome/app
parent8d34c475c53b27511a912880aebea627ad651625 (diff)
downloadchromium_src-83fe23a3ff26c5dea371ce94f6a909c4d081b145.zip
chromium_src-83fe23a3ff26c5dea371ce94f6a909c4d081b145.tar.gz
chromium_src-83fe23a3ff26c5dea371ce94f6a909c4d081b145.tar.bz2
Reverting r29095 (removes wrench integration for
browser actions). TBR=mpcomplete@chromium.org BUG=24379,24671 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29097 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_dll_resource.h9
-rw-r--r--chrome/app/generated_resources.grd3
2 files changed, 11 insertions, 1 deletions
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h
index d83cf8a..92e7487 100644
--- a/chrome/app/chrome_dll_resource.h
+++ b/chrome/app/chrome_dll_resource.h
@@ -179,7 +179,6 @@
#define IDC_SHOW_APP_MENU 40020
#define IDC_SHOW_PAGE_MENU 40021
#define IDC_SHOW_EXTENSION_SHELF 40022
-#define IDC_MANAGE_EXTENSIONS 40023
// Spell-check
// Insert any additional suggestions before _LAST; these have to be consecutive.
@@ -217,3 +216,11 @@
#define IDC_HISTORY_MENU 46000 // OSX only
#define IDC_HISTORY_MENU_VISITED 46100 // OSX only
#define IDC_HISTORY_MENU_CLOSED 46200 // OSX only
+
+// Extensions menu
+// Dynamic items from extensions are filled in between _FIRST and _LAST. If we
+// end up with more than 997 browser actions registered, we have other problems.
+#define IDC_SHOW_EXTENSIONS_SUBMENU 47000
+#define IDC_MANAGE_EXTENSIONS 47001
+#define IDC_BROWSER_ACTION_FIRST 47002
+#define IDC_BROWSER_ACTION_LAST 47999
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index e89a8202..ebc1ed7 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -946,6 +946,9 @@ each locale. -->
<message name="IDS_SHOW_EXTENSIONS" desc="The show extensions menu in the app menu">
&amp;Extensions
</message>
+ <message name="IDS_MANAGE_EXTENSIONS" desc="The manage extensions menu item in the extensions submenu">
+ &amp;Manage extensions
+ </message>
<message name="IDS_OPTIONS" desc="The text label of the Options menu item">
&amp;Options
</message>