diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 07:32:01 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 07:32:01 +0000 |
| commit | 9fd542df08cfbff0743b2553d3855a87ce16cbfc (patch) | |
| tree | 32332f42daf9ed425c198f831033a39a1c5ae2a1 /chrome/app | |
| parent | fa9a7b41ccbf11213d2264cec8e6ff2dbd142fcc (diff) | |
| download | chromium_src-9fd542df08cfbff0743b2553d3855a87ce16cbfc.zip chromium_src-9fd542df08cfbff0743b2553d3855a87ce16cbfc.tar.gz chromium_src-9fd542df08cfbff0743b2553d3855a87ce16cbfc.tar.bz2 | |
Integrate browser actions with the wrench menu. Browser
actions always show up in a submenu of the wrench menu, and
if they have an icon, they also show up in the toolbar area.
BUG=23380,22883
TEST=Added new automated tests for the command handling, but we need to test that the menu items show up manually. To do that, run with no extension installed, you should see "extensions" in the wrench menu. Add an extension that adds a browser action, you should now see an "extensions" submenu with "manage extensions" and the browser action(s) in the submenu.
Review URL: http://codereview.chromium.org/246037
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27599 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_resource.h | 7 | ||||
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll_resource.h b/chrome/app/chrome_dll_resource.h index f99438b..91a802d 100644 --- a/chrome/app/chrome_dll_resource.h +++ b/chrome/app/chrome_dll_resource.h @@ -216,3 +216,10 @@ #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 3e9c6b6..b83ca67 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -943,6 +943,12 @@ each locale. --> <message name="IDS_SHOW_DOWNLOADS" desc="The show downloads menu in the app menu"> &Downloads </message> + <message name="IDS_SHOW_EXTENSIONS" desc="The show extensions menu in the app menu"> + &Extensions + </message> + <message name="IDS_MANAGE_EXTENSIONS" desc="The manage extensions menu item in the extensions submenu"> + &Manage extensions + </message> <message name="IDS_OPTIONS" desc="The text label of the Options menu item"> &Options </message> |