IME refactoring: ChromeOS introduce input methods State.

chrome/browser/extensions/api/input_ime/input_ime_api.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/extensions/api/input_ime/input_ime_api.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
@@ skipping 291 matching lines @@
       if ((*it)->extension_id() == extension_id_ && !(*it)->IsLazy())
         return true;
     }
     return false;
   }
 
   // The component IME extensions need to know the current screen type (e.g.
   // lock screen, login screen, etc.) so that its on-screen keyboard page
   // won't open new windows/pages. See crbug.com/395621.
   std::string GetCurrentScreenType() {
-    switch (chromeos::input_method::InputMethodManager::Get()->GetState()) {
+    switch (chromeos::input_method::InputMethodManager::Get()
+                ->GetUISessionState()) {
       case chromeos::input_method::InputMethodManager::STATE_LOGIN_SCREEN:
         return "login";
       case chromeos::input_method::InputMethodManager::STATE_LOCK_SCREEN:
         return "lock";
       case chromeos::input_method::InputMethodManager::STATE_BROWSER_SCREEN:
         return UserAddingScreen::Get()->IsRunning() ? "secondary-login"
                                                     : "normal";
       case chromeos::input_method::InputMethodManager::STATE_TERMINATING:
         return "normal";
     }
@@ skipping 57 matching lines @@
           component.options_page_url,
           component.input_view_url));
     }
   }
 
   scoped_ptr<chromeos::InputMethodEngineInterface::Observer> observer(
       new chromeos::ImeObserver(extension_id));
   chromeos::InputMethodEngine* engine = new chromeos::InputMethodEngine();
   engine->Initialize(observer.Pass(), extension_id.c_str());
   engine_map_[extension_id] = engine;
-  manager->AddInputMethodExtension(extension_id, descriptors, engine);
+  manager->GetActiveIMEState()->AddInputMethodExtension(
+      extension_id, descriptors, engine);
 
   return true;
 }
 
 void InputImeEventRouter::UnregisterAllImes(const std::string& extension_id) {
   std::map<std::string, InputMethodEngineInterface*>::iterator it =
       engine_map_.find(extension_id);
   if (it != engine_map_.end()) {
     chromeos::input_method::InputMethodManager::Get()
+        ->GetActiveIMEState()
         ->RemoveInputMethodExtension(extension_id);
     delete it->second;
     engine_map_.erase(it);
   }
 }
 
 InputMethodEngineInterface* InputImeEventRouter::GetEngine(
     const std::string& extension_id,
     const std::string& component_id) {
   std::map<std::string, InputMethodEngineInterface*>::iterator it =
@@ skipping 433 matching lines @@
   // Notifies the IME extension for IME ready with onActivate/onFocus events.
   if (engine)
     engine->Enable(engine->GetActiveComponentId());
 }
 
 InputImeEventRouter* InputImeAPI::input_ime_event_router() {
   return InputImeEventRouter::GetInstance();
 }
 
 }  // namespace extensions