Rename LanguageMenuButton to InputMethodMenuButton to be consistent with other code in the Chrome tree.

BUG=chromium-os:7528
TEST=manually

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

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

12 files changed, 44 insertions, 45 deletions

diff --git a/chrome/browser/chromeos/frame/browser_view.cc b/chrome/browser/chromeos/frame/browser_view.cc
index de80354..22a8b92 100644
--- a/chrome/browser/chromeos/frame/browser_view.cc
+++ b/chrome/browser/chromeos/frame/browser_view.cc
@@ -12,7 +12,7 @@
 #include "base/command_line.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/chromeos/frame/panel_browser_view.h"
-#include "chrome/browser/chromeos/status/language_menu_button.h"
+#include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
@@ -322,7 +322,7 @@ void BrowserView::ExecuteBrowserCommand(int id) const {
 void BrowserView::OpenButtonOptions(const views::View* button_view) const {
   if (button_view == status_area_->network_view()) {
     browser()->OpenInternetOptionsDialog();
-  } else if (button_view == status_area_->language_view()) {
+  } else if (button_view == status_area_->input_method_view()) {
     browser()->OpenLanguageOptionsDialog();
   } else {
     browser()->OpenSystemOptionsDialog();
diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc
index 62324e2..87b582b 100644
--- a/chrome/browser/chromeos/login/background_view.cc
+++ b/chrome/browser/chromeos/login/background_view.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 #include "chrome/browser/chromeos/status/feedback_menu_button.h"
-#include "chrome/browser/chromeos/status/language_menu_button.h"
+#include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
@@ -286,7 +286,7 @@ bool BackgroundView::ShouldOpenButtonOptions(
     const views::View* button_view) const {
   if (button_view == status_area_->clock_view() ||
       button_view == status_area_->feedback_view() ||
-      button_view == status_area_->language_view() ||
+      button_view == status_area_->input_method_view() ||
       button_view == status_area_->network_view()) {
     return false;
   }
diff --git a/chrome/browser/chromeos/login/keyboard_switch_menu.h b/chrome/browser/chromeos/login/keyboard_switch_menu.h
index 9403a1e..e07af0b 100644
--- a/chrome/browser/chromeos/login/keyboard_switch_menu.h
+++ b/chrome/browser/chromeos/login/keyboard_switch_menu.h
@@ -9,7 +9,7 @@
 #include <string>
 
 #include "base/scoped_ptr.h"
-#include "chrome/browser/chromeos/status/language_menu_button.h"
+#include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
 
 namespace chromeos {
diff --git a/chrome/browser/chromeos/status/feedback_menu_button.cc b/chrome/browser/chromeos/status/feedback_menu_button.cc
index d3b14d3..f7cb958 100644
--- a/chrome/browser/chromeos/status/feedback_menu_button.cc
+++ b/chrome/browser/chromeos/status/feedback_menu_button.cc
@@ -17,7 +17,7 @@
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
-// LanguageMenuButton
+// FeedbackMenuButton
 
 FeedbackMenuButton::FeedbackMenuButton(StatusAreaHost* host)
     : StatusAreaButton(this),
diff --git a/chrome/browser/chromeos/status/language_menu_button.cc b/chrome/browser/chromeos/status/input_method_menu_button.cc
index 53eef99..fbc20e4 100644
--- a/chrome/browser/chromeos/status/language_menu_button.cc
+++ b/chrome/browser/chromeos/status/input_method_menu_button.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/status/language_menu_button.h"
+#include "chrome/browser/chromeos/status/input_method_menu_button.h"
 
 #include <string>
 
@@ -30,9 +30,9 @@ PrefService* GetPrefService(chromeos::StatusAreaHost* host) {
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
-// LanguageMenuButton
+// InputMethodMenuButton
 
-LanguageMenuButton::LanguageMenuButton(StatusAreaHost* host)
+InputMethodMenuButton::InputMethodMenuButton(StatusAreaHost* host)
     : StatusAreaButton(this),
       InputMethodMenu(GetPrefService(host),
                       host->IsBrowserMode(),
@@ -51,13 +51,13 @@ LanguageMenuButton::LanguageMenuButton(StatusAreaHost* host)
   // |pref_service| is not available (for example, unit tests) or |pref_service|
   // is available, but Chrome preferences are not available (for example,
   // initial OS boot).
-  LanguageMenuButton::UpdateUI(L"US", L"");
+  InputMethodMenuButton::UpdateUI(L"US", L"");
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // views::View implementation:
 
-void LanguageMenuButton::OnLocaleChanged() {
+void InputMethodMenuButton::OnLocaleChanged() {
   input_method::OnLocaleChanged();
   const InputMethodDescriptor& input_method =
       CrosLibrary::Get()->GetInputMethodLibrary()->current_input_method();
@@ -69,7 +69,7 @@ void LanguageMenuButton::OnLocaleChanged() {
 ////////////////////////////////////////////////////////////////////////////////
 // InputMethodMenu::InputMethodMenuHost implementation:
 
-void LanguageMenuButton::UpdateUI(
+void InputMethodMenuButton::UpdateUI(
     const std::wstring& name, const std::wstring& tooltip) {
   // Hide the button only if there is only one input method, and the input
   // method is a XKB keyboard layout. We don't hide the button for other
@@ -92,11 +92,11 @@ void LanguageMenuButton::UpdateUI(
   SchedulePaint();
 }
 
-void LanguageMenuButton::OpenConfigUI() {
+void InputMethodMenuButton::OpenConfigUI() {
   host_->OpenButtonOptions(this);  // ask browser to open the DOMUI page.
 }
 
-bool LanguageMenuButton::ShouldSupportConfigUI() {
+bool InputMethodMenuButton::ShouldSupportConfigUI() {
   return host_->ShouldOpenButtonOptions(this);
 }
 
diff --git a/chrome/browser/chromeos/status/language_menu_button.h b/chrome/browser/chromeos/status/input_method_menu_button.h
index 28a21b5..41db9a9 100644
--- a/chrome/browser/chromeos/status/language_menu_button.h
+++ b/chrome/browser/chromeos/status/input_method_menu_button.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_
-#define CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_
+#ifndef CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_BUTTON_H_
+#define CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_BUTTON_H_
 #pragma once
 
 #include <string>
@@ -17,11 +17,11 @@ class StatusAreaHost;
 
 // A class for the button in the status area which expands the dropdown menu for
 // switching input method and keyboard layout.
-class LanguageMenuButton : public StatusAreaButton,
-                           public InputMethodMenu {
+class InputMethodMenuButton : public StatusAreaButton,
+                              public InputMethodMenu {
  public:
-  explicit LanguageMenuButton(StatusAreaHost* host);
-  virtual ~LanguageMenuButton() {}
+  explicit InputMethodMenuButton(StatusAreaHost* host);
+  virtual ~InputMethodMenuButton() {}
 
   // views::View implementation.
   virtual void OnLocaleChanged();
@@ -33,12 +33,11 @@ class LanguageMenuButton : public StatusAreaButton,
   virtual bool ShouldSupportConfigUI();
   virtual void OpenConfigUI();
 
- private:
   StatusAreaHost* host_;
 
-  DISALLOW_COPY_AND_ASSIGN(LanguageMenuButton);
+  DISALLOW_COPY_AND_ASSIGN(InputMethodMenuButton);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_STATUS_LANGUAGE_MENU_BUTTON_H_
+#endif  // CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_BUTTON_H_
diff --git a/chrome/browser/chromeos/status/language_menu_button_browsertest.cc b/chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc
index 2176997..2fc8977 100644
--- a/chrome/browser/chromeos/status/language_menu_button_browsertest.cc
+++ b/chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/chromeos/status/language_menu_button.h"
+#include "chrome/browser/chromeos/status/input_method_menu_button.h"
 
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
@@ -16,9 +16,9 @@
 
 namespace chromeos {
 
-class LanguageMenuButtonTest : public CrosInProcessBrowserTest {
+class InputMethodMenuButtonTest : public CrosInProcessBrowserTest {
  protected:
-  LanguageMenuButtonTest()
+  InputMethodMenuButtonTest()
       : CrosInProcessBrowserTest() {
   }
 
@@ -27,20 +27,20 @@ class LanguageMenuButtonTest : public CrosInProcessBrowserTest {
     cros_mock_->SetStatusAreaMocksExpectations();
   }
 
-  LanguageMenuButton* GetLanguageMenuButton() {
+  InputMethodMenuButton* GetInputMethodMenuButton() {
     BrowserView* view = static_cast<BrowserView*>(browser()->window());
     return static_cast<StatusAreaView*>(view->
-        GetViewByID(VIEW_ID_STATUS_AREA))->language_view();
+        GetViewByID(VIEW_ID_STATUS_AREA))->input_method_view();
   }
 };
 
-IN_PROC_BROWSER_TEST_F(LanguageMenuButtonTest, InitialIndicatorTest) {
-  LanguageMenuButton* language = GetLanguageMenuButton();
-  ASSERT_TRUE(language != NULL);
+IN_PROC_BROWSER_TEST_F(InputMethodMenuButtonTest, InitialIndicatorTest) {
+  InputMethodMenuButton* input_method = GetInputMethodMenuButton();
+  ASSERT_TRUE(input_method != NULL);
 
   // Since the default input method is "xkb:us::eng", "US" should be set for the
   // indicator.
-  std::wstring indicator = language->text();
+  std::wstring indicator = input_method->text();
   EXPECT_EQ(L"US", indicator);
 }
 
diff --git a/chrome/browser/chromeos/status/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc
index 27a3a54..bd34685 100644
--- a/chrome/browser/chromeos/status/status_area_view.cc
+++ b/chrome/browser/chromeos/status/status_area_view.cc
@@ -8,7 +8,7 @@
 
 #include "chrome/browser/chromeos/status/clock_menu_button.h"
 #include "chrome/browser/chromeos/status/feedback_menu_button.h"
-#include "chrome/browser/chromeos/status/language_menu_button.h"
+#include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #include "chrome/browser/chromeos/status/network_menu_button.h"
 #include "chrome/browser/chromeos/status/power_menu_button.h"
 #include "chrome/browser/chromeos/status/status_area_host.h"
@@ -23,15 +23,15 @@ StatusAreaView::StatusAreaView(StatusAreaHost* host)
     : host_(host),
       clock_view_(NULL),
       feedback_view_(NULL),
-      language_view_(NULL),
+      input_method_view_(NULL),
       network_view_(NULL),
       power_view_(NULL) {
 }
 
 void StatusAreaView::Init() {
-  // Language.
-  language_view_ = new LanguageMenuButton(host_);
-  AddChildView(language_view_);
+  // InputMethod.
+  input_method_view_ = new InputMethodMenuButton(host_);
+  AddChildView(input_method_view_);
 
   // Feedback.
   feedback_view_ = new FeedbackMenuButton(host_);
diff --git a/chrome/browser/chromeos/status/status_area_view.h b/chrome/browser/chromeos/status/status_area_view.h
index 0e4ecc3..b119667 100644
--- a/chrome/browser/chromeos/status/status_area_view.h
+++ b/chrome/browser/chromeos/status/status_area_view.h
@@ -14,7 +14,7 @@ namespace chromeos {
 
 class ClockMenuButton;
 class FeedbackMenuButton;
-class LanguageMenuButton;
+class InputMethodMenuButton;
 class NetworkMenuButton;
 class PowerMenuButton;
 class StatusAreaHost;
@@ -35,7 +35,7 @@ class StatusAreaView : public AccessibleToolbarView {
 
   ClockMenuButton* clock_view() { return clock_view_; }
   FeedbackMenuButton* feedback_view() { return feedback_view_; }
-  LanguageMenuButton* language_view() { return language_view_; }
+  InputMethodMenuButton* input_method_view() { return input_method_view_; }
   NetworkMenuButton* network_view() { return network_view_; }
   PowerMenuButton* power_view() { return power_view_; }
 
@@ -44,7 +44,7 @@ class StatusAreaView : public AccessibleToolbarView {
 
   ClockMenuButton* clock_view_;
   FeedbackMenuButton* feedback_view_;
-  LanguageMenuButton* language_view_;
+  InputMethodMenuButton* input_method_view_;
   NetworkMenuButton* network_view_;
   PowerMenuButton* power_view_;
 
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index c27ad25..83bc462 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -65,7 +65,7 @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/preferences.h"
-#include "chrome/browser/chromeos/status/language_menu_button.h"
+#include "chrome/browser/chromeos/status/input_method_menu_button.h"
 #endif
 
 namespace browser {
@@ -100,7 +100,7 @@ void RegisterLocalState(PrefService* local_state) {
   chromeos::UserManager::RegisterPrefs(local_state);
   chromeos::UserCrosSettingsProvider::RegisterPrefs(local_state);
   WizardController::RegisterPrefs(local_state);
-  chromeos::LanguageMenuButton::RegisterPrefs(local_state);
+  chromeos::InputMethodMenuButton::RegisterPrefs(local_state);
   chromeos::ApplyServicesCustomization::RegisterPrefs(local_state);
 #endif
 }
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c4042a5..59f2055 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -704,8 +704,8 @@
         'browser/chromeos/status/feedback_menu_button.h',
         'browser/chromeos/status/input_method_menu.cc',
         'browser/chromeos/status/input_method_menu.h',
-        'browser/chromeos/status/language_menu_button.cc',
-        'browser/chromeos/status/language_menu_button.h',
+        'browser/chromeos/status/input_method_menu_button.cc',
+        'browser/chromeos/status/input_method_menu_button.h',
         'browser/chromeos/status/network_dropdown_button.cc',
         'browser/chromeos/status/network_dropdown_button.h',
         'browser/chromeos/status/network_menu.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 9179209..8824326 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1886,7 +1886,7 @@
         'browser/chromeos/options/wifi_config_view_browsertest.cc',
         'browser/chromeos/panels/panel_browsertest.cc',
         'browser/chromeos/status/clock_menu_button_browsertest.cc',
-        'browser/chromeos/status/language_menu_button_browsertest.cc',
+        'browser/chromeos/status/input_method_menu_button_browsertest.cc',
         'browser/chromeos/status/power_menu_button_browsertest.cc',
         'browser/chromeos/tab_closeable_state_watcher_browsertest.cc',
         'browser/chromeos/update_browsertest.cc',