Introduce a configuration layer for c/b/input_method.

This allows a number of configuration-type methods to be removed from the public interface of InputMethodManager.

BUG=None


Review URL: https://chromiumcodereview.appspot.com/11316312

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172354 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/ui/ash/ime_controller_chromeos.cc b/chrome/browser/ui/ash/ime_controller_chromeos.cc
index 480d4af..8669922 100644
--- a/chrome/browser/ui/ash/ime_controller_chromeos.cc
+++ b/chrome/browser/ui/ash/ime_controller_chromeos.cc
@@ -4,24 +4,25 @@
 
 #include "chrome/browser/ui/ash/ime_controller_chromeos.h"
 
+#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "ui/base/accelerators/accelerator.h"
 
 bool ImeController::HandleNextIme() {
   chromeos::input_method::InputMethodManager* manager =
-      chromeos::input_method::InputMethodManager::GetInstance();
+      chromeos::input_method::GetInputMethodManager();
   return manager->SwitchToNextInputMethod();
 }
 
 bool ImeController::HandlePreviousIme() {
   chromeos::input_method::InputMethodManager* manager =
-      chromeos::input_method::InputMethodManager::GetInstance();
+      chromeos::input_method::GetInputMethodManager();
   return manager->SwitchToPreviousInputMethod();
 }
 
 bool ImeController::HandleSwitchIme(const ui::Accelerator& accelerator) {
   chromeos::input_method::InputMethodManager* manager =
-      chromeos::input_method::InputMethodManager::GetInstance();
+      chromeos::input_method::GetInputMethodManager();
   return manager->SwitchInputMethod(accelerator);
 }
 
@@ -48,7 +49,7 @@ ui::Accelerator ImeController::RemapAccelerator(
 
 bool ImeController::UsingFrenchInputMethod() const {
   chromeos::input_method::InputMethodManager* manager =
-      chromeos::input_method::InputMethodManager::GetInstance();
+      chromeos::input_method::GetInputMethodManager();
   const chromeos::input_method::InputMethodDescriptor& descriptor =
       manager->GetCurrentInputMethod();
   const std::string& layout = descriptor.id();