diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 21:55:26 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-24 21:55:26 +0000 |
| commit | bb114701ea8384781b4b3b51c45040a21e2d60fe (patch) | |
| tree | 28210e858e4cfde44e8e742a45abe8500fe435af /chrome | |
| parent | 9fae610ae66a48ff4da59a1fe4ad3a460be03512 (diff) | |
| download | chromium_src-bb114701ea8384781b4b3b51c45040a21e2d60fe.zip chromium_src-bb114701ea8384781b4b3b51c45040a21e2d60fe.tar.gz chromium_src-bb114701ea8384781b4b3b51c45040a21e2d60fe.tar.bz2 | |
Change the menu item 'Options' to 'Settings' on the wrench menu.
BUG=56152
TEST=out/Debug/chrome --enable-tabbed-options, go to wrench menu, you should see
a 'Settings' menu item. Also without the switch you should still see the
'Options' menu item.
Review URL: http://codereview.chromium.org/3398026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/app/generated_resources.grd | 6 | ||||
| -rw-r--r-- | chrome/browser/wrench_menu_model.cc | 19 |
2 files changed, 18 insertions, 7 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd index bb98b17..9738ef1 100644 --- a/chrome/app/generated_resources.grd +++ b/chrome/app/generated_resources.grd @@ -998,6 +998,9 @@ each locale. --> <message name="IDS_SHOW_EXTENSIONS" desc="The show extensions menu in the app menu"> &Extensions </message> + <message name="IDS_SETTINGS" desc="The text label of the Settings menu item"> + &Settings + </message> <message name="IDS_OPTIONS" desc="The text label of the Options menu item"> &Options </message> @@ -1033,6 +1036,9 @@ each locale. --> <message name="IDS_SHOW_EXTENSIONS" desc="In Title Case: The show extensions menu in the app menu"> &Extensions </message> + <message name="IDS_SETTINGS" desc="In Title Case: The text label of the Settings menu item"> + &Settings + </message> <message name="IDS_OPTIONS" desc="In Title Case: The text label of the Options menu item"> &Options </message> diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc index eae5c4f..e18c4ce 100644 --- a/chrome/browser/wrench_menu_model.cc +++ b/chrome/browser/wrench_menu_model.cc @@ -373,17 +373,22 @@ void WrenchMenuModel::Build() { AddItemWithStringId(IDC_SHOW_DOWNLOADS, IDS_SHOW_DOWNLOADS); AddSeparator(); + if (CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableTabbedOptions)) { + AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS); + } else { #if defined(OS_MACOSX) - AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES_MAC); + AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES_MAC); #elif defined(OS_LINUX) - string16 preferences = gtk_util::GetStockPreferencesMenuLabel(); - if (!preferences.empty()) - AddItem(IDC_OPTIONS, preferences); - else - AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS); + string16 preferences = gtk_util::GetStockPreferencesMenuLabel(); + if (!preferences.empty()) + AddItem(IDC_OPTIONS, preferences); + else + AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS); #else - AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS); + AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS); #endif + } #if defined(OS_CHROMEOS) AddCheckItemWithStringId(IDC_TOGGLE_VERTICAL_TABS, |