Add GetScreenMode() to status_area_host.h.

chrome/browser/chromeos/status/input_method_menu.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // 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/input_method_menu.h"
 
 #include <string>
 #include <vector>
 
 #include "app/l10n_util.h"
@@ skipping 100 matching lines @@
 }
 
 }  // namespace
 
 namespace chromeos {
 
 ////////////////////////////////////////////////////////////////////////////////
 // InputMethodMenu
 
 InputMethodMenu::InputMethodMenu(PrefService* pref_service,
-                                 bool is_browser_mode,
-                                 bool is_screen_locker_mode,
-                                 bool is_out_of_box_experience_mode)
+                                 StatusAreaHost::ScreenMode screen_mode,
+                                 bool for_out_of_box_experience_dialog)
     : input_method_descriptors_(CrosLibrary::Get()->GetInputMethodLibrary()->
                                 GetActiveInputMethods()),
       model_(NULL),
       // Be aware that the constructor of |input_method_menu_| calls
       // GetItemCount() in this class. Therefore, GetItemCount() have to return
       // 0 when |model_| is NULL.
       ALLOW_THIS_IN_INITIALIZER_LIST(input_method_menu_(this)),
       minimum_input_method_menu_width_(0),
       pref_service_(pref_service),
-      is_browser_mode_(is_browser_mode),
-      is_screen_locker_mode_(is_screen_locker_mode),
-      is_out_of_box_experience_mode_(is_out_of_box_experience_mode) {
+      screen_mode_(screen_mode),
+      for_out_of_box_experience_dialog_(for_out_of_box_experience_dialog) {
   DCHECK(input_method_descriptors_.get() &&
          !input_method_descriptors_->empty());
 
   // Sync current and previous input methods on Chrome prefs with ibus-daemon.
   // InputMethodChanged() will be called soon and the indicator will be updated.
   InputMethodLibrary* library = CrosLibrary::Get()->GetInputMethodLibrary();
-  if (pref_service && is_browser_mode_) {
+  if (pref_service && (screen_mode_ == StatusAreaHost::kBrowserMode)) {
     previous_input_method_pref_.Init(
         prefs::kLanguagePreviousInputMethod, pref_service, this);
     const std::string previous_input_method_id =
         previous_input_method_pref_.GetValue();
     if (!previous_input_method_id.empty()) {
       library->ChangeInputMethod(previous_input_method_id);
     }
 
     current_input_method_pref_.Init(
         prefs::kLanguageCurrentInputMethod, pref_service, this);
     const std::string current_input_method_id =
         current_input_method_pref_.GetValue();
     if (!current_input_method_id.empty()) {
       library->ChangeInputMethod(current_input_method_id);
     }
   }
   library->AddObserver(this);
 
-  if (!is_browser_mode_ && !is_screen_locker_mode_) {
+  if (screen_mode_ == StatusAreaHost::kLoginMode) {
     // This button is for the login screen.
     registrar_.Add(this,
                    NotificationType::LOGIN_USER_CHANGED,
                    NotificationService::AllSources());
   }
 }
 
 InputMethodMenu::~InputMethodMenu() {
   // RemoveObserver() is no-op if |this| object is already removed from the
   // observer list.
@@ skipping 36 matching lines @@
   }
 
   // Separator(s) or the "Customize language and input..." button.
   return false;
 }
 
 int InputMethodMenu::GetGroupIdAt(int index) const {
   DCHECK_GE(index, 0);
 
   if (IndexIsInInputMethodList(index)) {
-    return is_out_of_box_experience_mode_ ?
+    return for_out_of_box_experience_dialog_ ?
         kRadioGroupNone : kRadioGroupLanguage;
   }
 
   if (GetPropertyIndex(index, &index)) {
     const ImePropertyList& property_list
         = CrosLibrary::Get()->GetInputMethodLibrary()->current_ime_properties();
     return property_list.at(index).selection_item_id;
   }
 
   return kRadioGroupNone;
@@ skipping 42 matching lines @@
 }
 
 ui::MenuModel::ItemType InputMethodMenu::GetTypeAt(int index) const {
   DCHECK_GE(index, 0);
 
   if (IndexPointsToConfigureImeMenuItem(index)) {
     return ui::MenuModel::TYPE_COMMAND;  // "Customize language and input"
   }
 
   if (IndexIsInInputMethodList(index)) {
-    return is_out_of_box_experience_mode_ ?
+    return for_out_of_box_experience_dialog_ ?
         ui::MenuModel::TYPE_COMMAND : ui::MenuModel::TYPE_RADIO;
   }
 
   if (GetPropertyIndex(index, &index)) {
     const ImePropertyList& property_list
         = CrosLibrary::Get()->GetInputMethodLibrary()->current_ime_properties();
     if (property_list.at(index).is_selection_item) {
       return ui::MenuModel::TYPE_RADIO;
     }
     return ui::MenuModel::TYPE_COMMAND;
@@ skipping 91 matching lines @@
     size_t num_active_input_methods) {
   UserMetrics::RecordAction(
       UserMetricsAction("LanguageMenuButton_InputMethodChanged"));
   UpdateUIFromInputMethod(current_input_method, num_active_input_methods);
 }
 
 void InputMethodMenu::PreferenceUpdateNeeded(
     InputMethodLibrary* obj,
     const InputMethodDescriptor& previous_input_method,
     const InputMethodDescriptor& current_input_method) {
-  if (is_browser_mode_) {
+  if (screen_mode_ == StatusAreaHost::kBrowserMode) {
     if (pref_service_) {  // make sure we're not in unit tests.
       // Sometimes (e.g. initial boot) |previous_input_method.id| is empty.
       previous_input_method_pref_.SetValue(previous_input_method.id);
       current_input_method_pref_.SetValue(current_input_method.id);
     }
-  } else {
-    // We're in the login screen (i.e. not in the normal browser mode nor screen
-    // locker mode).
+  } else if (screen_mode_ == StatusAreaHost::kLoginMode) {
     if (g_browser_process && g_browser_process->local_state()) {
       g_browser_process->local_state()->SetString(
           language_prefs::kPreferredKeyboardLayout, current_input_method.id);
       g_browser_process->local_state()->SavePersistentPrefs();
     }
   }
 }
 
 void InputMethodMenu::PrepareForMenuOpen() {
   UserMetrics::RecordAction(UserMetricsAction("LanguageMenuButton_Open"));
@@ skipping 198 matching lines @@
     CrosLibrary::Get()->GetInputMethodLibrary()->RemoveObserver(this);
   }
 }
 
 void InputMethodMenu::SetMinimumWidth(int width) {
   // On the OOBE network selection screen, fixed width menu would be preferable.
   minimum_input_method_menu_width_ = width;
 }
 
 }  // namespace chromeos