summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/extensions/input_method_event_router.cc
diff options
context:
space:
mode:
authorerikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-11 18:36:32 +0000
committererikwright@chromium.org <erikwright@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-11 18:36:32 +0000
commitc02a42452d8b8eb2c1193cafc7e71562392e572c (patch)
tree3f87ebefef5a85bd08dc5304ca03e76389e6a06a /chrome/browser/chromeos/extensions/input_method_event_router.cc
parenta5fdb93ec2f6dc1b33d79bb3396c0cdb35f519f6 (diff)
downloadchromium_src-c02a42452d8b8eb2c1193cafc7e71562392e572c.zip
chromium_src-c02a42452d8b8eb2c1193cafc7e71562392e572c.tar.gz
chromium_src-c02a42452d8b8eb2c1193cafc7e71562392e572c.tar.bz2
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
Diffstat (limited to 'chrome/browser/chromeos/extensions/input_method_event_router.cc')
-rw-r--r--chrome/browser/chromeos/extensions/input_method_event_router.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/extensions/input_method_event_router.cc b/chrome/browser/chromeos/extensions/input_method_event_router.cc
index 1dff75e..b7202b8 100644
--- a/chrome/browser/chromeos/extensions/input_method_event_router.cc
+++ b/chrome/browser/chromeos/extensions/input_method_event_router.cc
@@ -8,6 +8,7 @@
#include "base/json/json_writer.h"
#include "base/values.h"
+#include "chrome/browser/chromeos/input_method/input_method_configuration.h"
#include "chrome/browser/chromeos/web_socket_proxy_controller.h"
#include "chrome/browser/extensions/event_names.h"
#include "chrome/browser/extensions/event_router.h"
@@ -25,11 +26,11 @@ const char kXkbPrefix[] = "xkb:";
namespace chromeos {
ExtensionInputMethodEventRouter::ExtensionInputMethodEventRouter() {
- input_method::InputMethodManager::GetInstance()->AddObserver(this);
+ input_method::GetInputMethodManager()->AddObserver(this);
}
ExtensionInputMethodEventRouter::~ExtensionInputMethodEventRouter() {
- input_method::InputMethodManager::GetInstance()->RemoveObserver(this);
+ input_method::GetInputMethodManager()->RemoveObserver(this);
}
void ExtensionInputMethodEventRouter::InputMethodChanged(