Rename RootWindowHost* to WindowTreeHost*

TBR=sky@chromium.org
http://crbug.com/308843

Review URL: https://codereview.chromium.org/76583003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236048 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 22 insertions, 22 deletions

diff --git a/ash/host/root_window_host_factory.cc b/ash/host/root_window_host_factory.cc
index 1f4cb3d..27bb614 100644
--- a/ash/host/root_window_host_factory.cc
+++ b/ash/host/root_window_host_factory.cc
@@ -8,14 +8,14 @@
 
 namespace {
 
-class RootWindowHostFactoryImpl : public ash::RootWindowHostFactory {
+class WindowTreeHostFactoryImpl : public ash::WindowTreeHostFactory {
  public:
-  RootWindowHostFactoryImpl() {}
+  WindowTreeHostFactoryImpl() {}
 
-  // Overridden from RootWindowHostFactory:
-  virtual aura::RootWindowHost* CreateRootWindowHost(
+  // Overridden from WindowTreeHostFactory:
+  virtual aura::WindowTreeHost* CreateWindowTreeHost(
       const gfx::Rect& initial_bounds) OVERRIDE {
-    return aura::RootWindowHost::Create(initial_bounds);
+    return aura::WindowTreeHost::Create(initial_bounds);
   }
 };
 
@@ -24,8 +24,8 @@ class RootWindowHostFactoryImpl : public ash::RootWindowHostFactory {
 namespace ash {
 
 // static
-RootWindowHostFactory* RootWindowHostFactory::Create() {
-  return new RootWindowHostFactoryImpl;
+WindowTreeHostFactory* WindowTreeHostFactory::Create() {
+  return new WindowTreeHostFactoryImpl;
 }
 
 }  // namespace ash
diff --git a/ash/host/root_window_host_factory.h b/ash/host/root_window_host_factory.h
index d357d9b..d956628 100644
--- a/ash/host/root_window_host_factory.h
+++ b/ash/host/root_window_host_factory.h
@@ -9,23 +9,23 @@
 #include "ui/gfx/rect.h"
 
 namespace aura {
-class RootWindowHost;
+class WindowTreeHost;
 }
 
 namespace ash {
 
-class ASH_EXPORT RootWindowHostFactory {
+class ASH_EXPORT WindowTreeHostFactory {
  public:
-  virtual ~RootWindowHostFactory() {}
+  virtual ~WindowTreeHostFactory() {}
 
-  static RootWindowHostFactory* Create();
+  static WindowTreeHostFactory* Create();
 
-  // Creates a new aura::RootWindowHost. The caller owns the returned value.
-  virtual aura::RootWindowHost* CreateRootWindowHost(
+  // Creates a new aura::WindowTreeHost. The caller owns the returned value.
+  virtual aura::WindowTreeHost* CreateWindowTreeHost(
       const gfx::Rect& initial_bounds) = 0;
 
  protected:
-  RootWindowHostFactory() {}
+  WindowTreeHostFactory() {}
 };
 
 }  // namespace ash
diff --git a/ash/host/root_window_host_factory_win.cc b/ash/host/root_window_host_factory_win.cc
index 3255f64..a072a85 100644
--- a/ash/host/root_window_host_factory_win.cc
+++ b/ash/host/root_window_host_factory_win.cc
@@ -12,19 +12,19 @@
 
 namespace {
 
-class RootWindowHostFactoryImpl : public ash::RootWindowHostFactory {
+class WindowTreeHostFactoryImpl : public ash::WindowTreeHostFactory {
  public:
-  RootWindowHostFactoryImpl() {}
+  WindowTreeHostFactoryImpl() {}
 
-  // Overridden from RootWindowHostFactory:
-  virtual aura::RootWindowHost* CreateRootWindowHost(
+  // Overridden from WindowTreeHostFactory:
+  virtual aura::WindowTreeHost* CreateWindowTreeHost(
       const gfx::Rect& initial_bounds) OVERRIDE {
     if (base::win::GetVersion() >= base::win::VERSION_WIN8 &&
         !CommandLine::ForCurrentProcess()->HasSwitch(
             ash::switches::kForceAshToDesktop))
-      return aura::RemoteRootWindowHostWin::Create(initial_bounds);
+      return aura::RemoteWindowTreeHostWin::Create(initial_bounds);
 
-    return aura::RootWindowHost::Create(initial_bounds);
+    return aura::WindowTreeHost::Create(initial_bounds);
   }
 };
 
@@ -33,8 +33,8 @@ class RootWindowHostFactoryImpl : public ash::RootWindowHostFactory {
 namespace ash {
 
 // static
-RootWindowHostFactory* RootWindowHostFactory::Create() {
-  return new RootWindowHostFactoryImpl;
+WindowTreeHostFactory* WindowTreeHostFactory::Create() {
+  return new WindowTreeHostFactoryImpl;
 }
 
 }  // namespace ash