summaryrefslogtreecommitdiffstats
path: root/ash/ime
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-21 16:35:51 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-21 16:35:51 +0000
commit7a8cbb36ad58fe2c443d6be3a55e387bc95f8592 (patch)
tree92df494b3193a09b72d92334e6121a80d1791abb /ash/ime
parent7de8404f117520baf2d45cf248c5450fecbb051f (diff)
downloadchromium_src-7a8cbb36ad58fe2c443d6be3a55e387bc95f8592.zip
chromium_src-7a8cbb36ad58fe2c443d6be3a55e387bc95f8592.tar.gz
chromium_src-7a8cbb36ad58fe2c443d6be3a55e387bc95f8592.tar.bz2
Change EventGenerator to take a RootWindow at construction instead of just assuming one via RootWindow::GetInstance().
http://crbug.com/112131 TEST=none Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=122716 Review URL: https://chromiumcodereview.appspot.com/9421016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122829 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ime')
-rw-r--r--ash/ime/input_method_event_filter_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ash/ime/input_method_event_filter_unittest.cc b/ash/ime/input_method_event_filter_unittest.cc
index 31a3c15..9b3f766 100644
--- a/ash/ime/input_method_event_filter_unittest.cc
+++ b/ash/ime/input_method_event_filter_unittest.cc
@@ -74,11 +74,11 @@ TEST_F(InputMethodEventFilterTest, TestInputMethodKeyEventPropagation) {
// automatically set up by AshTestBase, consumes it and sends a new
// ui::ET_TRANSLATED_KEY_* event to the root window, which will be consumed by
// the test event filter.
- aura::test::EventGenerator generator_;
+ aura::test::EventGenerator generator(Shell::GetRootWindow());
EXPECT_EQ(0, test_filter.key_event_count());
- generator_.PressKey(ui::VKEY_SPACE, 0);
+ generator.PressKey(ui::VKEY_SPACE, 0);
EXPECT_EQ(1, test_filter.key_event_count());
- generator_.ReleaseKey(ui::VKEY_SPACE, 0);
+ generator.ReleaseKey(ui::VKEY_SPACE, 0);
EXPECT_EQ(2, test_filter.key_event_count());
root_filter->RemoveFilter(&test_filter);