Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2081)

Unified Diff: ash/sticky_keys/sticky_keys_unittest.cc

Issue 126513004: Rename RootWindowHost to WindowTreeHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/sticky_keys/sticky_keys_controller.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/sticky_keys/sticky_keys_unittest.cc
diff --git a/ash/sticky_keys/sticky_keys_unittest.cc b/ash/sticky_keys/sticky_keys_unittest.cc
index 6016da975627359038f287880e972a51843f87c3..94742478ce3c9e741671ccc60b4fc9f63b4497e7 100644
--- a/ash/sticky_keys/sticky_keys_unittest.cc
+++ b/ash/sticky_keys/sticky_keys_unittest.cc
@@ -264,7 +264,7 @@ class StickyKeysTest : public test::AshTestBase,
handler->HandleKeyEvent(ev.get());
}
- void SendActivateStickyKeyPattern(aura::RootWindowHostDelegate* delegate,
+ void SendActivateStickyKeyPattern(aura::WindowTreeHostDelegate* delegate,
ui::KeyboardCode key_code) {
scoped_ptr<ui::KeyEvent> ev;
ev.reset(GenerateKey(true, key_code));
@@ -792,8 +792,8 @@ TEST_F(StickyKeysTest, KeyEventDispatchImpl) {
// Test the actual key event dispatch implementation.
EventBuffer buffer;
ScopedVector<ui::Event> events;
- aura::RootWindowHostDelegate* delegate = Shell::GetPrimaryRootWindow()
- ->GetDispatcher()->AsRootWindowHostDelegate();
+ aura::WindowTreeHostDelegate* delegate = Shell::GetPrimaryRootWindow()
+ ->GetDispatcher()->AsWindowTreeHostDelegate();
Shell::GetInstance()->AddPreTargetHandler(&buffer);
Shell::GetInstance()->sticky_keys_controller()->Enable(true);
@@ -831,8 +831,8 @@ TEST_F(StickyKeysTest, MouseEventDispatchImpl) {
// Test the actual sticky mouse event dispatch implementation.
EventBuffer buffer;
ScopedVector<ui::Event> events;
- aura::RootWindowHostDelegate* delegate = Shell::GetPrimaryRootWindow()
- ->GetDispatcher()->AsRootWindowHostDelegate();
+ aura::WindowTreeHostDelegate* delegate = Shell::GetPrimaryRootWindow()
+ ->GetDispatcher()->AsWindowTreeHostDelegate();
Shell::GetInstance()->AddPreTargetHandler(&buffer);
Shell::GetInstance()->sticky_keys_controller()->Enable(true);
@@ -867,8 +867,8 @@ TEST_F(StickyKeysTest, MouseWheelEventDispatchImpl) {
// Test the actual mouse wheel event dispatch implementation.
EventBuffer buffer;
ScopedVector<ui::Event> events;
- aura::RootWindowHostDelegate* delegate = Shell::GetPrimaryRootWindow()
- ->GetDispatcher()->AsRootWindowHostDelegate();
+ aura::WindowTreeHostDelegate* delegate = Shell::GetPrimaryRootWindow()
+ ->GetDispatcher()->AsWindowTreeHostDelegate();
Shell::GetInstance()->AddPreTargetHandler(&buffer);
Shell::GetInstance()->sticky_keys_controller()->Enable(true);
« no previous file with comments | « ash/sticky_keys/sticky_keys_controller.cc ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698