IME refactoring: ChromeOS introduce input methods State.

chrome/browser/chromeos/input_method/mode_indicator_controller.cc

 // Copyright 2013 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/mode_indicator_controller.h"
 
 #include "ash/ime/mode_indicator_view.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_util.h"
@@ skipping 82 matching lines @@
 void ModeIndicatorController::ShowModeIndicator() {
   // TODO(komatsu): Show the mode indicator in the right bottom of the
   // display when the launch bar is hidden and the focus is out.  To
   // implement it, we should consider to use message center or system
   // notification.  Note, launch bar can be vertical and can be placed
   // right/left side of display.
   if (!is_focused_)
     return;
 
   // Get the short name of the changed input method (e.g. US, JA, etc.)
-  const InputMethodDescriptor descriptor = imm_->GetCurrentInputMethod();
+  const InputMethodDescriptor descriptor =
+      imm_->GetActiveIMEState()->GetCurrentInputMethod();
   const base::string16 short_name =
       imm_->GetInputMethodUtil()->GetInputMethodShortName(descriptor);
 
   aura::Window* parent =
       ash::Shell::GetContainer(ash::wm::GetActiveWindow()->GetRootWindow(),
                                ash::kShellWindowId_SettingBubbleContainer);
   ash::ime::ModeIndicatorView* mi_view = new ash::ime::ModeIndicatorView(
       parent, cursor_bounds_, short_name);
   views::BubbleDelegateView::CreateBubble(mi_view);
 
   views::Widget* mi_widget = mi_view->GetWidget();
   if (GetModeIndicatorObserverForTesting())
     GetModeIndicatorObserverForTesting()->AddModeIndicatorWidget(mi_widget);
 
   mi_observer_->AddModeIndicatorWidget(mi_widget);
   mi_view->ShowAndFadeOut();
 }
 
 }  // namespace input_method
 }  // namespace chromeos