diff options
| -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, |