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

Unified Diff: ash/host/root_window_host_factory_win.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/host/root_window_host_factory.cc ('k') | ash/shell.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/host/root_window_host_factory_win.cc
diff --git a/ash/host/root_window_host_factory_win.cc b/ash/host/root_window_host_factory_win.cc
index 3255f644d315f1ed581e97c0a84110c2162e6696..a072a85b63a6395234f3fe9465c600c77751356b 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
« no previous file with comments | « ash/host/root_window_host_factory.cc ('k') | ash/shell.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698