diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 16:41:23 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-08 16:41:23 +0000 |
| commit | 641dcfd54a64f53c356f10373d7ee70d3342cae8 (patch) | |
| tree | 98a90fe540025e96a5e155567d3da1dfab34361a /ash/accelerators/accelerator_controller_unittest.cc | |
| parent | 6a617b58c1229bb0dce0727dc8a97f20df973baf (diff) | |
| download | chromium_src-641dcfd54a64f53c356f10373d7ee70d3342cae8.zip chromium_src-641dcfd54a64f53c356f10373d7ee70d3342cae8.tar.gz chromium_src-641dcfd54a64f53c356f10373d7ee70d3342cae8.tar.bz2 | |
Rename RootWindowHost to WindowTreeHost
TBR=sky@chromium.org
http://crbug.com/308843
Review URL: https://codereview.chromium.org/126513004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@243578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/accelerators/accelerator_controller_unittest.cc')
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 8569171..189db90 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc @@ -654,32 +654,32 @@ TEST_F(AcceleratorControllerTest, MAYBE_ProcessOnce) { #if defined(OS_WIN) MSG msg1 = { NULL, WM_KEYDOWN, ui::VKEY_A, 0 }; ui::TranslatedKeyEvent key_event1(msg1, false); - EXPECT_TRUE(dispatcher->AsRootWindowHostDelegate()->OnHostKeyEvent( + EXPECT_TRUE(dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent( &key_event1)); MSG msg2 = { NULL, WM_CHAR, L'A', 0 }; ui::TranslatedKeyEvent key_event2(msg2, true); - EXPECT_FALSE(dispatcher->AsRootWindowHostDelegate()->OnHostKeyEvent( + EXPECT_FALSE(dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent( &key_event2)); MSG msg3 = { NULL, WM_KEYUP, ui::VKEY_A, 0 }; ui::TranslatedKeyEvent key_event3(msg3, false); - EXPECT_FALSE(dispatcher->AsRootWindowHostDelegate()->OnHostKeyEvent( + EXPECT_FALSE(dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent( &key_event3)); #elif defined(USE_X11) ui::ScopedXI2Event key_event; key_event.InitKeyEvent(ui::ET_KEY_PRESSED, ui::VKEY_A, 0); ui::TranslatedKeyEvent key_event1(key_event, false); - EXPECT_TRUE(dispatcher->AsRootWindowHostDelegate()->OnHostKeyEvent( + EXPECT_TRUE(dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent( &key_event1)); ui::TranslatedKeyEvent key_event2(key_event, true); - EXPECT_FALSE(dispatcher->AsRootWindowHostDelegate()->OnHostKeyEvent( + EXPECT_FALSE(dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent( &key_event2)); key_event.InitKeyEvent(ui::ET_KEY_RELEASED, ui::VKEY_A, 0); ui::TranslatedKeyEvent key_event3(key_event, false); - EXPECT_FALSE(dispatcher->AsRootWindowHostDelegate()->OnHostKeyEvent( + EXPECT_FALSE(dispatcher->AsWindowTreeHostDelegate()->OnHostKeyEvent( &key_event3)); #endif EXPECT_EQ(1, target.accelerator_pressed_count()); |