IME refactoring: ChromeOS introduce input methods State.

chrome/browser/chromeos/input_method/input_method_persistence.cc

 // Copyright (c) 2012 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/input_method/input_method_persistence.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/sys_info.h"
@@ skipping 89 matching lines @@
                         current_input_method_on_pref);
   user_prefs->SetString(prefs::kLanguageCurrentInputMethod,
                         input_method);
 }
 
 }  // namespace
 
 InputMethodPersistence::InputMethodPersistence(
     InputMethodManager* input_method_manager)
     : input_method_manager_(input_method_manager),
-      state_(InputMethodManager::STATE_LOGIN_SCREEN) {
+      ui_session_(InputMethodManager::STATE_LOGIN_SCREEN) {
   input_method_manager_->AddObserver(this);
 }
 
 InputMethodPersistence::~InputMethodPersistence() {
   input_method_manager_->RemoveObserver(this);
 }
 
 void InputMethodPersistence::InputMethodChanged(
     InputMethodManager* manager, bool show_message) {
   DCHECK_EQ(input_method_manager_, manager);
   const std::string current_input_method =
-      manager->GetCurrentInputMethod().id();
+      manager->GetActiveIMEState()->GetCurrentInputMethod().id();
   // Save the new input method id depending on the current browser state.
-  switch (state_) {
+  switch (ui_session_) {
     case InputMethodManager::STATE_LOGIN_SCREEN:
       if (!manager->IsLoginKeyboard(current_input_method)) {
         DVLOG(1) << "Only keyboard layouts are supported: "
                  << current_input_method;
         return;
       }
       PersistSystemInputMethod(current_input_method);
       return;
     case InputMethodManager::STATE_BROWSER_SCREEN:
       PersistUserInputMethod(current_input_method, manager);
       return;
     case InputMethodManager::STATE_LOCK_SCREEN:
       // We use a special set of input methods on the screen. Do not update.
       return;
     case InputMethodManager::STATE_TERMINATING:
       return;
   }
   NOTREACHED();
 }
 
 void InputMethodPersistence::OnSessionStateChange(
-    InputMethodManager::State new_state) {
-  state_ = new_state;
+    InputMethodManager::UISessionState new_ui_session) {
+  ui_session_ = new_ui_session;
 }
 
 }  // namespace input_method
 }  // namespace chromeos