IME refactoring: ChromeOS introduce input methods State.

chrome/browser/ui/ash/ime_controller_chromeos.cc

Index: chrome/browser/ui/ash/ime_controller_chromeos.cc
diff --git a/chrome/browser/ui/ash/ime_controller_chromeos.cc b/chrome/browser/ui/ash/ime_controller_chromeos.cc
index 3847b4f7d7da9b148800d516f26b56d230741527..a940ac8a385af648829bdea18341737e4a723cb4 100644
--- a/chrome/browser/ui/ash/ime_controller_chromeos.cc
+++ b/chrome/browser/ui/ash/ime_controller_chromeos.cc
@@ -10,19 +10,19 @@
 void ImeController::HandleNextIme() {
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
-  manager->SwitchToNextInputMethod();
+  manager->GetActiveIMEState()->SwitchToNextInputMethod();
 }
 
 bool ImeController::HandlePreviousIme(const ui::Accelerator& accelerator) {
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
-  return manager->SwitchToPreviousInputMethod(accelerator);
+  return manager->GetActiveIMEState()->SwitchToPreviousInputMethod(accelerator);
 }
 
 bool ImeController::HandleSwitchIme(const ui::Accelerator& accelerator) {
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
-  return manager->SwitchInputMethod(accelerator);
+  return manager->GetActiveIMEState()->SwitchInputMethod(accelerator);
 }
 
 ui::Accelerator ImeController::RemapAccelerator(
@@ -50,7 +50,7 @@ bool ImeController::UsingFrenchInputMethod() const {
   chromeos::input_method::InputMethodManager* manager =
       chromeos::input_method::InputMethodManager::Get();
   const chromeos::input_method::InputMethodDescriptor& descriptor =
-      manager->GetCurrentInputMethod();
+      manager->GetActiveIMEState()->GetCurrentInputMethod();
   const std::string& layout = descriptor.id();
   return (layout == "xkb:fr::fra" || layout == "xkb:be::fra");
 }