summaryrefslogtreecommitdiffstats
path: root/ui/views/widget
diff options
context:
space:
mode:
authoroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-03 15:07:06 +0000
committeroshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-03 15:07:06 +0000
commit0caad58857fd90155eb141f243723813ed183355 (patch)
tree1198224d232ced24168e2f43be6cba5b074f99ba /ui/views/widget
parentd14ae07374f7b6301861abc526dcc8514c1f2a21 (diff)
downloadchromium_src-0caad58857fd90155eb141f243723813ed183355.zip
chromium_src-0caad58857fd90155eb141f243723813ed183355.tar.gz
chromium_src-0caad58857fd90155eb141f243723813ed183355.tar.bz2
Remove dependency to primary root window in InputMethodEventFilter
R=yusukes@chromium.org BUG=123160 TEST=no functional change. all tests should pass. Review URL: https://chromiumcodereview.appspot.com/10440128 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140236 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget')
-rw-r--r--ui/views/widget/desktop_native_widget_helper_aura.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/views/widget/desktop_native_widget_helper_aura.cc b/ui/views/widget/desktop_native_widget_helper_aura.cc
index 5dd8295..3edae09 100644
--- a/ui/views/widget/desktop_native_widget_helper_aura.cc
+++ b/ui/views/widget/desktop_native_widget_helper_aura.cc
@@ -117,8 +117,7 @@ void DesktopNativeWidgetHelperAura::PreInitialize(
new aura::shared::RootWindowEventFilter(root_window_.get());
root_window_->SetEventFilter(root_window_event_filter_);
- input_method_filter_.reset(
- new aura::shared::InputMethodEventFilter(root_window_.get()));
+ input_method_filter_.reset(new aura::shared::InputMethodEventFilter());
root_window_event_filter_->AddFilter(input_method_filter_.get());
aura::DesktopActivationClient* activation_client =