From 4ebcbf892aaac28bc4be2f6ee65d576667124879 Mon Sep 17 00:00:00 2001
From: "tfarina@chromium.org"
 <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Sat, 20 Nov 2010 16:57:04 +0000
Subject: DOMUI: Do not change the current menu labels for Win/Mac/Linux.

The menu labels should remain the same as they do now without the flag for Win, Mac, Linux, and ChromeOS (see below).

Win: Options
Mac/Linux: Preferences
ChromeOS: Settings

BUG=63432
TEST=open chrome with or without --enable-tabbed-options the labels should be the same as above.

Review URL: http://codereview.chromium.org/5113004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66889 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/app/generated_resources.grd        | 14 +++++++++++---
 chrome/app/nibs/MainMenu.xib              |  2 +-
 chrome/browser/background_mode_manager.cc | 21 +++++++++------------
 chrome/browser/wrench_menu_model.cc       | 23 ++++++++++-------------
 4 files changed, 31 insertions(+), 29 deletions(-)

(limited to 'chrome')

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 1f1ad28..7dcd59a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -978,6 +978,17 @@ each locale. -->
         Close
       </message>
 
+      <if expr="os == 'darwin'">
+        <message name="IDS_PREFERENCES" desc="The Mac menu item to open the preferences window in the app menu.">
+          Preferences...
+        </message>
+      </if>
+      <if expr="os == 'linux2'">
+        <message name="IDS_PREFERENCES" desc="The text label of the Preferences menu item.">
+          Preferences
+        </message>
+      </if>
+
       <!-- App menu -->
       <if expr="not pp_ifdef('use_titlecase')">
         <message name="IDS_SHOW_HISTORY" desc="The show history menu in the app menu">
@@ -8474,9 +8485,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
         <message name="IDS_ABOUT_MAC" desc="The Mac menu item to open the about box.">
           About <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph>
         </message>
-        <message name="IDS_PREFERENCES_MAC" desc="The Mac menu item to open the preferences window in the app menu.">
-          Preferences...
-        </message>
         <message name="IDS_CLEAR_BROWSING_DATA_MAC" desc="The Mac menu item for clearing of browsing data in the app menu.">
           Clear Browsing Data...
         </message>
diff --git a/chrome/app/nibs/MainMenu.xib b/chrome/app/nibs/MainMenu.xib
index 0c45c44..ad925e3 100644
--- a/chrome/app/nibs/MainMenu.xib
+++ b/chrome/app/nibs/MainMenu.xib
@@ -83,7 +83,7 @@
 								</object>
 								<object class="NSMenuItem" id="609285721">
 									<reference key="NSMenu" ref="110575045"/>
-									<string key="NSTitle">^IDS_PREFERENCES_MAC</string>
+									<string key="NSTitle">^IDS_PREFERENCES</string>
 									<string key="NSKeyEquiv">,</string>
 									<int key="NSKeyEquivModMask">1048576</int>
 									<int key="NSMnemonicLoc">2147483647</int>
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();
diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc
index 1e7258da..fa4da42 100644
--- a/chrome/browser/wrench_menu_model.cc
+++ b/chrome/browser/wrench_menu_model.cc
@@ -391,22 +391,19 @@ 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);
+#if defined(OS_CHROMEOS)
+  AddItemWithStringId(IDC_OPTIONS, IDS_SETTINGS);
+#elif defined(OS_MACOSX)
+  AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES);
 #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_PREFERENCES);
 #else
-    AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
+  AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
 #endif
-  }
 
 #if defined(OS_CHROMEOS)
   const string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_OS_NAME);
-- 
cgit v1.1