s/LanguageSwitchModel/LanguageSwitchMenu/

BUG=none
TEST=none

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

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

11 files changed, 44 insertions, 44 deletions

diff --git a/chrome/browser/chromeos/login/language_switch_model.cc b/chrome/browser/chromeos/login/language_switch_menu.cc
index 4e749b8..4c0ea24 100644
--- a/chrome/browser/chromeos/login/language_switch_model.cc
+++ b/chrome/browser/chromeos/login/language_switch_menu.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/login/language_switch_model.h"
+#include "chrome/browser/chromeos/login/language_switch_menu.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ -25,14 +25,14 @@ const int kMoreLanguagesSubMenu = 200;
 
 namespace chromeos {
 
-LanguageSwitchModel::LanguageSwitchModel()
+LanguageSwitchMenu::LanguageSwitchMenu()
     : ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(menu_model_submenu_(this)),
       delta_x_(0),
       delta_y_(0) {
 }
 
-void LanguageSwitchModel::InitLanguageMenu() {
+void LanguageSwitchMenu::InitLanguageMenu() {
   // Update LanguageList to contain entries in current locale.
   language_list_.reset(new LanguageList);
   language_list_->CopySpecifiedLanguagesUp(kLanguagesTopped);
@@ -60,7 +60,7 @@ void LanguageSwitchModel::InitLanguageMenu() {
   menu_.reset(new views::Menu2(&menu_model_));
 }
 
-std::wstring LanguageSwitchModel::GetCurrentLocaleName() const {
+std::wstring LanguageSwitchMenu::GetCurrentLocaleName() const {
   DCHECK(g_browser_process);
   const std::string locale = g_browser_process->GetApplicationLocale();
   return language_list_->GetLanguageNameAt(
@@ -69,20 +69,20 @@ std::wstring LanguageSwitchModel::GetCurrentLocaleName() const {
 
 // Currently, views::Menu is implemented directly with the Gtk
 // widgets. So we use native gtk callbacks to get its future size.
-int LanguageSwitchModel::GetFirstLevelMenuWidth() const {
+int LanguageSwitchMenu::GetFirstLevelMenuWidth() const {
   DCHECK(menu_ != NULL);
   GtkRequisition box_size;
   gtk_widget_size_request(menu_->GetNativeMenu(), &box_size);
   return box_size.width;
 }
 
-void LanguageSwitchModel::SetFirstLevelMenuWidth(int width) {
+void LanguageSwitchMenu::SetFirstLevelMenuWidth(int width) {
   DCHECK(menu_ != NULL);
   gtk_widget_set_size_request(menu_->GetNativeMenu(), width, -1);
 }
 
 // static
-void LanguageSwitchModel::SwitchLanguage(const std::string& locale) {
+void LanguageSwitchMenu::SwitchLanguage(const std::string& locale) {
   // Save new locale.
   DCHECK(g_browser_process);
   PrefService* prefs = g_browser_process->local_state();
@@ -99,7 +99,7 @@ void LanguageSwitchModel::SwitchLanguage(const std::string& locale) {
 ////////////////////////////////////////////////////////////////////////////////
 // views::ViewMenuDelegate implementation.
 
-void LanguageSwitchModel::RunMenu(views::View* source, const gfx::Point& pt) {
+void LanguageSwitchMenu::RunMenu(views::View* source, const gfx::Point& pt) {
   DCHECK(menu_ != NULL);
   gfx::Point point(pt);
   point.Offset(delta_x_, delta_y_);
@@ -109,20 +109,20 @@ void LanguageSwitchModel::RunMenu(views::View* source, const gfx::Point& pt) {
 ////////////////////////////////////////////////////////////////////////////////
 // menus::SimpleMenuModel::Delegate implementation.
 
-bool LanguageSwitchModel::IsCommandIdChecked(int command_id) const {
+bool LanguageSwitchMenu::IsCommandIdChecked(int command_id) const {
   return false;
 }
 
-bool LanguageSwitchModel::IsCommandIdEnabled(int command_id) const {
+bool LanguageSwitchMenu::IsCommandIdEnabled(int command_id) const {
   return true;
 }
 
-bool LanguageSwitchModel::GetAcceleratorForCommandId(
+bool LanguageSwitchMenu::GetAcceleratorForCommandId(
     int command_id, menus::Accelerator* accelerator) {
   return false;
 }
 
-void LanguageSwitchModel::ExecuteCommand(int command_id) {
+void LanguageSwitchMenu::ExecuteCommand(int command_id) {
   const std::string locale = language_list_->GetLocaleFromIndex(command_id);
   SwitchLanguage(locale);
   InitLanguageMenu();
diff --git a/chrome/browser/chromeos/login/language_switch_model.h b/chrome/browser/chromeos/login/language_switch_menu.h
index d3732d5..849d537 100644
--- a/chrome/browser/chromeos/login/language_switch_model.h
+++ b/chrome/browser/chromeos/login/language_switch_menu.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_LOGIN_LANGUAGE_SWITCH_MODEL_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_LANGUAGE_SWITCH_MODEL_H_
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_LANGUAGE_SWITCH_MENU_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_LANGUAGE_SWITCH_MENU_H_
 
 #include <string>
 
@@ -21,10 +21,10 @@ namespace chromeos {
 
 class ScreenObserver;
 
-class LanguageSwitchModel : public views::ViewMenuDelegate,
-                            public menus::SimpleMenuModel::Delegate {
+class LanguageSwitchMenu : public views::ViewMenuDelegate,
+                           public menus::SimpleMenuModel::Delegate {
  public:
-  LanguageSwitchModel();
+  LanguageSwitchMenu();
 
   // Initializes language selection menu contents.
   void InitLanguageMenu();
@@ -66,9 +66,9 @@ class LanguageSwitchModel : public views::ViewMenuDelegate,
   int delta_x_, delta_y_;
 
   FRIEND_TEST(::WizardControllerTest, SwitchLanguage);
-  DISALLOW_COPY_AND_ASSIGN(LanguageSwitchModel);
+  DISALLOW_COPY_AND_ASSIGN(LanguageSwitchMenu);
 };
 
 }  // namespace chromeos
 
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LANGUAGE_SWITCH_MODEL_H_
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_LANGUAGE_SWITCH_MENU_H_
diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
index 60cec2b..a28a136 100644
--- a/chrome/browser/chromeos/login/network_screen.cc
+++ b/chrome/browser/chromeos/login/network_screen.cc
@@ -153,7 +153,7 @@ void NetworkScreen::OnDialogCancelled() {
 // NetworkScreen, ViewScreen implementation:
 
 void NetworkScreen::CreateView() {
-  language_switch_model_.InitLanguageMenu();
+  language_switch_menu_.InitLanguageMenu();
   ViewScreen<NetworkSelectionView>::CreateView();
 }
 
diff --git a/chrome/browser/chromeos/login/network_screen.h b/chrome/browser/chromeos/login/network_screen.h
index 68b7ec9..973fbc4 100644
--- a/chrome/browser/chromeos/login/network_screen.h
+++ b/chrome/browser/chromeos/login/network_screen.h
@@ -11,7 +11,7 @@
 #include "base/timer.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/login/network_screen_delegate.h"
-#include "chrome/browser/chromeos/login/language_switch_model.h"
+#include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/view_screen.h"
 #include "chrome/browser/chromeos/network_list.h"
 #include "chrome/browser/chromeos/options/network_config_view.h"
@@ -30,8 +30,8 @@ class NetworkScreen : public ViewScreen<NetworkSelectionView>,
   virtual ~NetworkScreen();
 
   // NetworkScreenDelegate implementation:
-  virtual LanguageSwitchModel* language_switch_model() {
-    return &language_switch_model_;
+  virtual LanguageSwitchMenu* language_switch_menu() {
+    return &language_switch_menu_;
   }
 
   // ComboboxModel implementation:
@@ -117,7 +117,7 @@ class NetworkScreen : public ViewScreen<NetworkSelectionView>,
   NetworkList::NetworkItem connecting_network_;
 
   ScopedRunnableMethodFactory<NetworkScreen> task_factory_;
-  LanguageSwitchModel language_switch_model_;
+  LanguageSwitchMenu language_switch_menu_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkScreen);
 };
diff --git a/chrome/browser/chromeos/login/network_screen_delegate.h b/chrome/browser/chromeos/login/network_screen_delegate.h
index f3a8fe4..a0c911a 100644
--- a/chrome/browser/chromeos/login/network_screen_delegate.h
+++ b/chrome/browser/chromeos/login/network_screen_delegate.h
@@ -12,7 +12,7 @@
 
 namespace chromeos {
 
-class LanguageSwitchModel;
+class LanguageSwitchMenu;
 
 // Interface that NetworkScreen exposes to the NetworkSelectionView.
 class NetworkScreenDelegate : public ComboboxModel,
@@ -20,7 +20,7 @@ class NetworkScreenDelegate : public ComboboxModel,
                               public views::ButtonListener,
                               public NetworkLibrary::Observer {
  public:
-  virtual LanguageSwitchModel* language_switch_model() = 0;
+  virtual LanguageSwitchMenu* language_switch_menu() = 0;
 
  protected:
   virtual ~NetworkScreenDelegate() {}
diff --git a/chrome/browser/chromeos/login/network_selection_view.cc b/chrome/browser/chromeos/login/network_selection_view.cc
index 7ef902c..333dbea 100644
--- a/chrome/browser/chromeos/login/network_selection_view.cc
+++ b/chrome/browser/chromeos/login/network_selection_view.cc
@@ -13,7 +13,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/network_screen_delegate.h"
 #include "chrome/browser/chromeos/login/rounded_rect_painter.h"
-#include "chrome/browser/chromeos/login/language_switch_model.h"
+#include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
@@ -116,9 +116,9 @@ void NetworkSelectionView::Init() {
   network_combobox_->set_listener(delegate_);
 
   languages_menubutton_ = new views::MenuButton(
-      NULL, std::wstring(), delegate_->language_switch_model(), true);
+      NULL, std::wstring(), delegate_->language_switch_menu(), true);
   languages_menubutton_->SetNormalHasBorder(true);
-  delegate_->language_switch_model()->set_menu_offset(
+  delegate_->language_switch_menu()->set_menu_offset(
       kMenuButtonHorizontalOffset, kMenuButtonVerticalOffset);
 
   AddChildView(welcome_label_);
@@ -134,7 +134,7 @@ void NetworkSelectionView::Init() {
 void NetworkSelectionView::UpdateLocalizedStrings() {
   RecreateNativeControls();
   languages_menubutton_->SetText(
-      delegate_->language_switch_model()->GetCurrentLocaleName());
+      delegate_->language_switch_menu()->GetCurrentLocaleName());
   welcome_label_->SetText(l10n_util::GetStringF(IDS_NETWORK_SELECTION_TITLE,
                           l10n_util::GetString(IDS_PRODUCT_OS_NAME)));
   select_language_label_->SetText(
@@ -180,14 +180,14 @@ void NetworkSelectionView::Layout() {
   y += welcome_label_->GetPreferredSize().height() + kSpacing;
 
   // Use menu preffered size to calculate boxes width accordingly.
-  int box_width = delegate_->language_switch_model()->GetFirstLevelMenuWidth() +
+  int box_width = delegate_->language_switch_menu()->GetFirstLevelMenuWidth() +
       kMenuButtonHorizontalOffset * 2;
   const int widest_label = std::max(
       select_language_label_->GetPreferredSize().width(),
       select_network_label_->GetPreferredSize().width());
   if (box_width < kSelectionBoxWidthMin) {
     box_width = kSelectionBoxWidthMin;
-    delegate_->language_switch_model()->SetFirstLevelMenuWidth(
+    delegate_->language_switch_menu()->SetFirstLevelMenuWidth(
         box_width - kMenuButtonHorizontalOffset * 2);
   } else if (widest_label + box_width + 2 * kHorizontalSpacing > width()) {
     box_width = width() - widest_label - 2 * kHorizontalSpacing;
diff --git a/chrome/browser/chromeos/login/new_user_view.cc b/chrome/browser/chromeos/login/new_user_view.cc
index 506c527..a753a1a 100644
--- a/chrome/browser/chromeos/login/new_user_view.cc
+++ b/chrome/browser/chromeos/login/new_user_view.cc
@@ -130,9 +130,9 @@ void NewUserView::Init() {
   InitLink(&cant_access_account_link_);
   InitLink(&browse_without_signin_link_);
 
-  language_switch_model_.InitLanguageMenu();
+  language_switch_menu_.InitLanguageMenu();
   languages_menubutton_ = new views::MenuButton(
-      NULL, std::wstring(), &language_switch_model_, true);
+      NULL, std::wstring(), &language_switch_menu_, true);
   AddChildView(languages_menubutton_);
 
   AddAccelerator(accel_focus_user_);
@@ -189,7 +189,7 @@ void NewUserView::UpdateLocalizedStrings() {
   browse_without_signin_link_->SetText(
       l10n_util::GetString(IDS_BROWSE_WITHOUT_SIGNING_IN_BUTTON));
   delegate_->ClearErrors();
-  languages_menubutton_->SetText(language_switch_model_.GetCurrentLocaleName());
+  languages_menubutton_->SetText(language_switch_menu_.GetCurrentLocaleName());
 }
 
 void NewUserView::LocaleChanged() {
diff --git a/chrome/browser/chromeos/login/new_user_view.h b/chrome/browser/chromeos/login/new_user_view.h
index 480d711..6124730 100644
--- a/chrome/browser/chromeos/login/new_user_view.h
+++ b/chrome/browser/chromeos/login/new_user_view.h
@@ -11,7 +11,7 @@
 #include "base/gtest_prod_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
-#include "chrome/browser/chromeos/login/language_switch_model.h"
+#include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/login_html_dialog.h"
 #include "views/accelerator.h"
 #include "views/controls/button/button.h"
@@ -149,7 +149,7 @@ class NewUserView : public views::View,
 
   ScopedRunnableMethodFactory<NewUserView> focus_grabber_factory_;
 
-  LanguageSwitchModel language_switch_model_;
+  LanguageSwitchMenu language_switch_menu_;
 
   // Dialog used to display help like "Can't access your account".
   scoped_ptr<LoginHtmlDialog> dialog_;
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 074a6e1..e80eb12 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -20,7 +20,7 @@
 #include "chrome/browser/chromeos/login/account_screen.h"
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/language_switch_model.h"
+#include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/login_screen.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
@@ -252,7 +252,7 @@ void WizardController::Init(const std::string& first_screen_name,
   if (customization_ != NULL) {
     const std::string locale = customization_->initial_locale();
     if (!locale.empty()) {
-      chromeos::LanguageSwitchModel::SwitchLanguage(locale);
+      chromeos::LanguageSwitchMenu::SwitchLanguage(locale);
     }
   }
 
diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
index eae3a59..4da996f 100644
--- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
+++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc
@@ -5,7 +5,7 @@
 #include "app/l10n_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/account_screen.h"
-#include "chrome/browser/chromeos/login/language_switch_model.h"
+#include "chrome/browser/chromeos/login/language_switch_menu.h"
 #include "chrome/browser/chromeos/login/login_screen.h"
 #include "chrome/browser/chromeos/login/mock_update_screen.h"
 #include "chrome/browser/chromeos/login/network_screen.h"
@@ -80,7 +80,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerTest, SwitchLanguage) {
   EXPECT_FALSE(base::i18n::IsRTL());
   const std::wstring en_str = l10n_util::GetString(IDS_NETWORK_SELECTION_TITLE);
 
-  chromeos::LanguageSwitchModel::SwitchLanguage("fr");
+  chromeos::LanguageSwitchMenu::SwitchLanguage("fr");
   EXPECT_EQ("fr", g_browser_process->GetApplicationLocale());
   EXPECT_STREQ("fr", icu::Locale::getDefault().getLanguage());
   EXPECT_FALSE(base::i18n::IsRTL());
@@ -88,7 +88,7 @@ IN_PROC_BROWSER_TEST_F(WizardControllerTest, SwitchLanguage) {
 
   EXPECT_NE(en_str, fr_str);
 
-  chromeos::LanguageSwitchModel::SwitchLanguage("ar");
+  chromeos::LanguageSwitchMenu::SwitchLanguage("ar");
   EXPECT_EQ("ar", g_browser_process->GetApplicationLocale());
   EXPECT_STREQ("ar", icu::Locale::getDefault().getLanguage());
   EXPECT_TRUE(base::i18n::IsRTL());
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index ee57084..119b1a9 100755
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -428,8 +428,8 @@
         'browser/chromeos/login/google_authenticator.cc',
         'browser/chromeos/login/google_authenticator.h',
         'browser/chromeos/login/helper.cc',
-        'browser/chromeos/login/language_switch_model.cc',
-        'browser/chromeos/login/language_switch_model.h',
+        'browser/chromeos/login/language_switch_menu.cc',
+        'browser/chromeos/login/language_switch_menu.h',
         'browser/chromeos/login/login_html_dialog.cc',
         'browser/chromeos/login/login_html_dialog.h',
         'browser/chromeos/login/login_screen.cc',