diff options
| author | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-19 18:52:31 +0000 |
|---|---|---|
| committer | maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-19 18:52:31 +0000 |
| commit | 2f36ed5c4da9d7a95dea77600e3579fa740c8a12 (patch) | |
| tree | 3b60e5f0efb7c202ae979fdc31634b80b86b9ceb /ash/ime | |
| parent | d09b6d2473505a49ebe97b95dbffe2153e594497 (diff) | |
| download | chromium_src-2f36ed5c4da9d7a95dea77600e3579fa740c8a12.zip chromium_src-2f36ed5c4da9d7a95dea77600e3579fa740c8a12.tar.gz chromium_src-2f36ed5c4da9d7a95dea77600e3579fa740c8a12.tar.bz2 | |
Revert r122716 and r122717
r122716 "Change EventGenerator to take a RootWindow at construction instead of just assuming one via RootWindow::GetInstance()."
r122717 "Fix build bustage. These two files were left out of my last CL due to permission issues."
Broke compile on Win. Current Mac compile failure is older and will be fixed in
a follow up CL.
TBR=ben@chromium.org
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/9424026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@122721 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 9b3f766..31a3c15 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(Shell::GetRootWindow()); + aura::test::EventGenerator generator_; 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); |