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

2 files changed, 11 insertions, 11 deletions

diff --git a/ash/sticky_keys/sticky_keys_controller.cc b/ash/sticky_keys/sticky_keys_controller.cc
index 5d9b93f..8640e49 100644
--- a/ash/sticky_keys/sticky_keys_controller.cc
+++ b/ash/sticky_keys/sticky_keys_controller.cc
@@ -58,7 +58,7 @@ StickyKeysHandlerDelegateImpl::~StickyKeysHandlerDelegateImpl() {
 void StickyKeysHandlerDelegateImpl::DispatchKeyEvent(ui::KeyEvent* event,
                                                      aura::Window* target) {
   DCHECK(target);
-  target->GetDispatcher()->AsRootWindowHostDelegate()->OnHostKeyEvent(event);
+  target->GetDispatcher()->AsWindowTreeHostDelegate()->OnHostKeyEvent(event);
 }
 
 void StickyKeysHandlerDelegateImpl::DispatchMouseEvent(ui::MouseEvent* event,
@@ -67,11 +67,11 @@ void StickyKeysHandlerDelegateImpl::DispatchMouseEvent(ui::MouseEvent* event,
   // We need to send a new, untransformed mouse event to the host.
   if (event->IsMouseWheelEvent()) {
     ui::MouseWheelEvent new_event(*static_cast<ui::MouseWheelEvent*>(event));
-    target->GetDispatcher()->AsRootWindowHostDelegate()
+    target->GetDispatcher()->AsWindowTreeHostDelegate()
         ->OnHostMouseEvent(&new_event);
   } else {
     ui::MouseEvent new_event(*event, target, target->GetRootWindow());
-    target->GetDispatcher()->AsRootWindowHostDelegate()
+    target->GetDispatcher()->AsWindowTreeHostDelegate()
         ->OnHostMouseEvent(&new_event);
   }
 }
@@ -80,7 +80,7 @@ void StickyKeysHandlerDelegateImpl::DispatchScrollEvent(
     ui::ScrollEvent* event,
     aura::Window* target)  {
   DCHECK(target);
-  target->GetDispatcher()->AsRootWindowHostDelegate()
+  target->GetDispatcher()->AsWindowTreeHostDelegate()
       ->OnHostScrollEvent(event);
 }
 
diff --git a/ash/sticky_keys/sticky_keys_unittest.cc b/ash/sticky_keys/sticky_keys_unittest.cc
index 6016da9..9474247 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);