| Index: chrome/browser/chromeos/input_method/input_method_manager.cc
|
| diff --git a/chrome/browser/chromeos/input_method/input_method_manager.cc b/chrome/browser/chromeos/input_method/input_method_manager.cc
|
| index 5006696b6f04974d3d6ae63c4ee6fa343d48b229..a9b2487d2f2f19e8c0611c0c9009122c5d213de1 100644
|
| --- a/chrome/browser/chromeos/input_method/input_method_manager.cc
|
| +++ b/chrome/browser/chromeos/input_method/input_method_manager.cc
|
| @@ -18,6 +18,7 @@
|
| #include "base/stringprintf.h"
|
| #include "chrome/browser/browser_process.h"
|
| #include "chrome/browser/chromeos/input_method/input_method_util.h"
|
| +#include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
|
| #include "chrome/browser/chromeos/input_method/virtual_keyboard_selector.h"
|
| #include "chrome/browser/chromeos/input_method/xkeyboard.h"
|
| #include "chrome/browser/chromeos/language_preferences.h"
|
| @@ -155,7 +156,7 @@ class InputMethodManagerImpl
|
| enable_auto_ime_shutdown_(true),
|
| shutting_down_(false),
|
| ibus_daemon_process_handle_(base::kNullProcessHandle),
|
| - util_(ibus_controller_->GetSupportedInputMethods()),
|
| + util_(whitelist_.GetSupportedInputMethods()),
|
| xkeyboard_(XKeyboard::Create(util_)),
|
| ignore_hotkeys_(false) {
|
| // Observe APP_TERMINATING to stop input method daemon gracefully.
|
| @@ -296,7 +297,7 @@ class InputMethodManagerImpl
|
| }
|
|
|
| virtual InputMethodDescriptors* GetSupportedInputMethods() {
|
| - return ibus_controller_->GetSupportedInputMethods();
|
| + return whitelist_.GetSupportedInputMethods();
|
| }
|
|
|
| virtual void ChangeInputMethod(const std::string& input_method_id) {
|
| @@ -1526,6 +1527,8 @@ class InputMethodManagerImpl
|
| const InputMethodSpecificHotkeySetting*> extra_hotkeys_;
|
| #endif
|
|
|
| + InputMethodWhitelist whitelist_;
|
| +
|
| // An object which provides miscellaneous input method utility functions. Note
|
| // that |util_| is required to initialize |xkeyboard_|.
|
| InputMethodUtil util_;
|
|
|