summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/ash/ime_controller_chromeos.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/ash/ime_controller_chromeos.cc')
-rw-r--r--chrome/browser/ui/ash/ime_controller_chromeos.cc9
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();