diff options
| author | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 07:34:22 +0000 |
|---|---|---|
| committer | nona@chromium.org <nona@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-04 07:34:22 +0000 |
| commit | 54f2994ea0adf85bc3441648245184249576fd1d (patch) | |
| tree | a6385fe3715bfd2a459be145b63aef0667622a2b /chrome/browser/chromeos/input_method/input_method_manager_impl.h | |
| parent | eadbaaf32f299ba14e6b792e4851322c287d4a4a (diff) | |
| download | chromium_src-54f2994ea0adf85bc3441648245184249576fd1d.zip chromium_src-54f2994ea0adf85bc3441648245184249576fd1d.tar.gz chromium_src-54f2994ea0adf85bc3441648245184249576fd1d.tar.bz2 | |
Use IBusDaemonController instead of IBusController.
I introduced IBusDaemonController(https://codereview.chromium.org/12045007/)
which launches ibus-daemon process and watch it's availability.
Before this patch, IBusController is responsible for this functionality.
BUG=None
TEST=try bots.
Review URL: https://chromiumcodereview.appspot.com/12317143
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185842 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/input_method/input_method_manager_impl.h')
| -rw-r--r-- | chrome/browser/chromeos/input_method/input_method_manager_impl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h index 0a5715b..00b67a0 100644 --- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h +++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h @@ -16,6 +16,7 @@ #include "chrome/browser/chromeos/input_method/input_method_manager.h" #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/input_method/input_method_whitelist.h" +#include "chromeos/ime/ibus_daemon_controller.h" namespace chromeos { class InputMethodEngineIBus; @@ -26,7 +27,8 @@ class XKeyboard; // The implementation of InputMethodManager. class InputMethodManagerImpl : public InputMethodManager, public CandidateWindowController::Observer, - public IBusController::Observer { + public IBusController::Observer, + public IBusDaemonController::Observer { public: // Constructs an InputMethodManager instance. The client is responsible for // calling |SetState| in response to relevant changes in browser state. @@ -94,6 +96,8 @@ class InputMethodManagerImpl : public InputMethodManager, private: // IBusController overrides: virtual void PropertyChanged() OVERRIDE; + + // IBusDaemonController overrides: virtual void OnConnected() OVERRIDE; virtual void OnDisconnected() OVERRIDE; |