Share the same label between the language selector and the options dialog.

The "Language and Input" dialog is opened from two places.
We should share the same label in the two places.

BUG=3431
TEST=manually

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47769 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 13 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index f0c9e32..65ea84c 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -7414,7 +7414,7 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_DNSSERVER" desc="In settings internet options, the label dns server.">
         DNS Server:
       </message>
-      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE">
+      <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE" desc="In settings system options, the label for the customize button for languages and input">
         Customize languages and input...
       </message>
       <message name="IDS_OPTIONS_SETTINGS_LANGUAGES_DIALOG_TITLE">
@@ -7594,9 +7594,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_STATUSBAR_BATTERY_IS_CHARGED" desc="In the power menu button, the battery is charged message.">
         Battery is charged
       </message>
-      <message name="IDS_STATUSBAR_IME_CONFIGURE" desc="Configure the text input method.">
-        Configure IME...
-      </message>
       <message name="IDS_VERSION_FIELD_PREFIX" desc="Display the OS version to the user.">
         OS version
       </message>
diff --git a/chrome/browser/chromeos/status/language_menu_button.cc b/chrome/browser/chromeos/status/language_menu_button.cc
index 9c59fe8..f3b9148 100644
--- a/chrome/browser/chromeos/status/language_menu_button.cc
+++ b/chrome/browser/chromeos/status/language_menu_button.cc
@@ -21,7 +21,7 @@
 //
 //   (1) input method names. The size of the list is always >= 1.
 //   (2) input method properties. This list might be empty.
-//   (3) "Configure IME..." button.
+//   (3) "Customize language and input..." button.
 //
 // Example of the menu (Japanese):
 //
@@ -36,7 +36,7 @@
 // [*] Roman
 // [ ] Kana
 // ------------------------------ (separator)
-// Configure IME...               (index = 11)
+// Customize language and input...(index = 11)
 // ============================== (border of the popup window)
 //
 // Example of the menu (Simplified Chinese):
@@ -49,7 +49,7 @@
 // Switch to full letter mode     (The property has 2 command buttons)
 // Switch to half punctuation mode
 // ------------------------------ (separator)
-// Configure IME...
+// Customize language and input...
 // ============================== (border of the popup window)
 //
 
@@ -59,7 +59,7 @@ namespace {
 enum {
   COMMAND_ID_INPUT_METHODS = 0,  // English, Chinese, Japanese, Arabic, ...
   COMMAND_ID_IME_PROPERTIES,  // Hiragana, Katakana, ...
-  COMMAND_ID_CONFIGURE_IME,  // The "Configure IME..." button.
+  COMMAND_ID_CUSTOMIZE_LANGUAGE,  // "Customize language and input..." button.
 };
 
 // A group ID for IME properties starts from 0. We use the huge value for the
@@ -191,7 +191,7 @@ bool LanguageMenuButton::IsItemCheckedAt(int index) const {
     return property_list.at(index).is_selection_item_checked;
   }
 
-  // Separator(s) or the "Configure IME" button.
+  // Separator(s) or the "Customize language and input..." button.
   return false;
 }
 
@@ -252,7 +252,7 @@ menus::MenuModel::ItemType LanguageMenuButton::GetTypeAt(int index) const {
   DCHECK_GE(index, 0);
 
   if (IndexPointsToConfigureImeMenuItem(index)) {
-    return menus::MenuModel::TYPE_COMMAND;  // "Configure IME"
+    return menus::MenuModel::TYPE_COMMAND;  // "Customize language and input"
   }
 
   if (IndexIsInInputMethodList(index)) {
@@ -275,8 +275,10 @@ string16 LanguageMenuButton::GetLabelAt(int index) const {
   DCHECK_GE(index, 0);
   DCHECK(input_method_descriptors_.get());
 
+  // We use IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE here as the button
+  // opens the same dialog that is opened from the main options dialog.
   if (IndexPointsToConfigureImeMenuItem(index)) {
-    return l10n_util::GetStringUTF16(IDS_STATUSBAR_IME_CONFIGURE);
+    return l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_LANGUAGES_CUSTOMIZE);
   }
 
   std::wstring name;
@@ -419,7 +421,8 @@ void LanguageMenuButton::RebuildModel() {
     // other items even if an item is not actually a radio item.
     if (need_separator)
       model_->AddSeparator();
-    model_->AddRadioItem(COMMAND_ID_CONFIGURE_IME, dummy_label, 0 /* dummy */);
+    model_->AddRadioItem(COMMAND_ID_CUSTOMIZE_LANGUAGE, dummy_label,
+                         0 /* dummy */);
   }
 }
 
@@ -466,7 +469,7 @@ bool LanguageMenuButton::IndexPointsToConfigureImeMenuItem(int index) const {
   }
 
   return ((model_->GetTypeAt(index) == menus::MenuModel::TYPE_RADIO) &&
-          (model_->GetCommandIdAt(index) == COMMAND_ID_CONFIGURE_IME));
+          (model_->GetCommandIdAt(index) == COMMAND_ID_CUSTOMIZE_LANGUAGE));
 }
 
 }  // namespace chromeos