diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 21:05:20 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 21:05:20 +0000 |
| commit | d5106a2f78b3e4ac84140e4bd6d0edda21626857 (patch) | |
| tree | a6d68645e646033a9a02c36efcb326f69081da52 /ash/ime | |
| parent | bd68281ba08cc627fc1e33273cb2d77f20a454f8 (diff) | |
| download | chromium_src-d5106a2f78b3e4ac84140e4bd6d0edda21626857.zip chromium_src-d5106a2f78b3e4ac84140e4bd6d0edda21626857.tar.gz chromium_src-d5106a2f78b3e4ac84140e4bd6d0edda21626857.tar.bz2 | |
Remove Owner param to EventFilter's ctor.
BUG=none
TEST=existing unittests
Review URL: https://chromiumcodereview.appspot.com/9315004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ime')
| -rw-r--r-- | ash/ime/input_method_event_filter.cc | 3 | ||||
| -rw-r--r-- | ash/ime/input_method_event_filter_unittest.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/ash/ime/input_method_event_filter.cc b/ash/ime/input_method_event_filter.cc index d9cdf42..d9c8e9c 100644 --- a/ash/ime/input_method_event_filter.cc +++ b/ash/ime/input_method_event_filter.cc @@ -19,8 +19,7 @@ namespace internal { // InputMethodEventFilter, public: InputMethodEventFilter::InputMethodEventFilter() - : EventFilter(aura::RootWindow::GetInstance()), - ALLOW_THIS_IN_INITIALIZER_LIST( + : ALLOW_THIS_IN_INITIALIZER_LIST( input_method_(ui::CreateInputMethod(this))) { // TODO(yusukes): Check if the root window is currently focused and pass the // result to Init(). diff --git a/ash/ime/input_method_event_filter_unittest.cc b/ash/ime/input_method_event_filter_unittest.cc index 397cad5..d475db0 100644 --- a/ash/ime/input_method_event_filter_unittest.cc +++ b/ash/ime/input_method_event_filter_unittest.cc @@ -49,7 +49,7 @@ TEST_F(InputMethodEventFilterTest, TestInputMethodKeyEventPropagation) { aura::RootWindow* root_window = aura::RootWindow::GetInstance(); // Add TestEventFilter to the RootWindow. - aura::test::TestEventFilter test_filter(root_window); + aura::test::TestEventFilter test_filter; internal::RootWindowEventFilter* root_filter = static_cast<internal::RootWindowEventFilter*>( root_window->event_filter()); |