diff options
Diffstat (limited to 'chrome/browser/background_mode_manager.cc')
| -rw-r--r-- | chrome/browser/background_mode_manager.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc index 666af19..b88a349 100644 --- a/chrome/browser/background_mode_manager.cc +++ b/chrome/browser/background_mode_manager.cc @@ -484,20 +484,17 @@ void BackgroundModeManager::UpdateStatusTrayIconContextMenu() { l10n_util::GetStringUTF16(IDS_PRODUCT_NAME))); // Add Preferences item - if (CommandLine::ForCurrentProcess()->HasSwitch( - switches::kEnableTabbedOptions)) { - menu->AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS); - } else { -#if defined(TOOLKIT_GTK) - string16 preferences = gtk_util::GetStockPreferencesMenuLabel(); - if (preferences.empty()) - menu->AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS); - else - menu->AddItem(IDC_OPTIONS, preferences); +#if defined(OS_CHROMEOS) + menu->AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS); +#elif defined(TOOLKIT_GTK) + string16 preferences = gtk_util::GetStockPreferencesMenuLabel(); + if (!preferences.empty()) + menu->AddItem(IDC_OPTIONS, preferences); + else + menu->AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES); #else - menu->AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS); + menu->AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS); #endif - } menu->AddSeparator(); int application_position = 0; context_menu_application_offset_ = menu->GetItemCount(); |