Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(331)

Unified Diff: chrome/browser/chromeos/input_method/input_method_manager.cc

Issue 9701095: cleanup: Split ibus_controller.h into 5 headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review fix Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_;

Powered by Google App Engine
This is Rietveld 408576698