| 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 de622892a8e3ba9e0dd2073e6f06457dc49c74d3..334c4e6d16795ef318b5867ace375bf85e06de95 100644
|
| --- a/ash/sticky_keys/sticky_keys_unittest.cc
|
| +++ b/ash/sticky_keys/sticky_keys_unittest.cc
|
| @@ -251,7 +251,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));
|
| @@ -756,8 +756,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);
|
|
|
| @@ -795,8 +795,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);
|
|
|
| @@ -831,8 +831,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);
|
|
|
|
|