summaryrefslogtreecommitdiffstats
path: root/ash/host
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-14 18:54:58 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-14 18:54:58 +0000
commite8cf7330b0f4187726568d1363eb85d7fd404f16 (patch)
treeeee645c53b6381054c0955a8bba7490038a6b3ef /ash/host
parent36f33ddbf966257d3f59239b10d61bb9b54688fd (diff)
downloadchromium_src-e8cf7330b0f4187726568d1363eb85d7fd404f16.zip
chromium_src-e8cf7330b0f4187726568d1363eb85d7fd404f16.tar.gz
chromium_src-e8cf7330b0f4187726568d1363eb85d7fd404f16.tar.bz2
Move root_window_host* in aura to window_tree_host*.
R=sky@chromium.org TBR=sky@chromium.org BUG= Review URL: https://codereview.chromium.org/160573002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251379 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/host')
-rw-r--r--ash/host/window_tree_host_factory.cc (renamed from ash/host/root_window_host_factory.cc)2
-rw-r--r--ash/host/window_tree_host_factory.h (renamed from ash/host/root_window_host_factory.h)6
-rw-r--r--ash/host/window_tree_host_factory_win.cc (renamed from ash/host/root_window_host_factory_win.cc)4
3 files changed, 6 insertions, 6 deletions
diff --git a/ash/host/root_window_host_factory.cc b/ash/host/window_tree_host_factory.cc
index 27bb614..ddb60d0 100644
--- a/ash/host/root_window_host_factory.cc
+++ b/ash/host/window_tree_host_factory.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/host/root_window_host_factory.h"
+#include "ash/host/window_tree_host_factory.h"
#include "ui/aura/window_tree_host.h"
diff --git a/ash/host/root_window_host_factory.h b/ash/host/window_tree_host_factory.h
index d956628..a17927c 100644
--- a/ash/host/root_window_host_factory.h
+++ b/ash/host/window_tree_host_factory.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef ASH_HOST_ROOT_WINDOW_HOST_FACTORY_H_
-#define ASH_HOST_ROOT_WINDOW_HOST_FACTORY_H_
+#ifndef ASH_HOST_WINDOW_TREE_HOST_FACTORY_H_
+#define ASH_HOST_WINDOW_TREE_HOST_FACTORY_H_
#include "ash/ash_export.h"
#include "ui/gfx/rect.h"
@@ -30,4 +30,4 @@ class ASH_EXPORT WindowTreeHostFactory {
} // namespace ash
-#endif // ASH_HOST_ROOT_WINDOW_HOST_FACTORY_H_
+#endif // ASH_HOST_WINDOW_TREE_HOST_FACTORY_H_
diff --git a/ash/host/root_window_host_factory_win.cc b/ash/host/window_tree_host_factory_win.cc
index a072a85..42eb753 100644
--- a/ash/host/root_window_host_factory_win.cc
+++ b/ash/host/window_tree_host_factory_win.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ash/host/root_window_host_factory.h"
+#include "ash/host/window_tree_host_factory.h"
#include "ash/ash_switches.h"
#include "base/command_line.h"
#include "base/win/windows_version.h"
-#include "ui/aura/remote_root_window_host_win.h"
+#include "ui/aura/remote_window_tree_host_win.h"
#include "ui/aura/window_tree_host.h"
namespace {