summaryrefslogtreecommitdiffstats
path: root/athena
diff options
context:
space:
mode:
authorshuchen <shuchen@chromium.org>2014-10-06 23:01:49 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-07 06:02:09 +0000
commitace6e32033201b3be8764fe7c91833bea4612299 (patch)
tree34757eafd797bdd5a907ef51c19354487eaae3ef /athena
parent6439a53dde557a4508d20e80119b718e1e79e01d (diff)
downloadchromium_src-ace6e32033201b3be8764fe7c91833bea4612299.zip
chromium_src-ace6e32033201b3be8764fe7c91833bea4612299.tar.gz
chromium_src-ace6e32033201b3be8764fe7c91833bea4612299.tar.bz2
Hook up IME extension for Athena.
Note: This cl won't make IMEs/IME VKs available in Athena. This is the 1st step to ensure the IME extension can be correctly loaded in Athena. BUG=407579,417079 TEST=Verified no breakage on linux_chromeos. Review URL: https://codereview.chromium.org/633453002 Cr-Commit-Position: refs/heads/master@{#298398}
Diffstat (limited to 'athena')
-rw-r--r--athena/env/athena_env_impl.cc3
1 files changed, 0 insertions, 3 deletions
diff --git a/athena/env/athena_env_impl.cc b/athena/env/athena_env_impl.cc
index f568da0..1a22632 100644
--- a/athena/env/athena_env_impl.cc
+++ b/athena/env/athena_env_impl.cc
@@ -190,9 +190,6 @@ class AthenaEnvImpl : public AthenaEnv,
root_window_event_filter_.reset(new wm::CompoundEventFilter);
host_->window()->AddPreTargetHandler(root_window_event_filter_.get());
- input_method_filter_.reset(
- new wm::InputMethodEventFilter(host_->GetAcceleratedWidget()));
- input_method_filter_->SetInputMethodPropertyInRootWindow(host_->window());
root_window_event_filter_->AddHandler(input_method_filter_.get());
capture_client_.reset(