diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-19 04:45:00 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-19 04:45:00 +0000 |
commit | 9557ef13eb27fb806fc1a79e7268cb131ff14201 (patch) | |
tree | d18327b7f02925625cd7fc3278e2ce6494bfac1e /ash/ime | |
parent | 49d89f8b55b2e802d40cb9bf7e8a7051924839aa (diff) | |
download | chromium_src-9557ef13eb27fb806fc1a79e7268cb131ff14201.zip chromium_src-9557ef13eb27fb806fc1a79e7268cb131ff14201.tar.gz chromium_src-9557ef13eb27fb806fc1a79e7268cb131ff14201.tar.bz2 |
Change EventGenerator to take a RootWindow at construction instead of just assuming one via RootWindow::GetInstance().
http://crbug.com/112131
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9421016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122716 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/ime')
-rw-r--r-- | ash/ime/input_method_event_filter_unittest.cc | 6 |
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); |