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

15 files changed, 64 insertions, 64 deletions

diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index fd72faf..9b37c6e 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -89,16 +89,16 @@
         'input_state_lookup_win.h',
         'layout_manager.cc',
         'layout_manager.h',
-        'remote_root_window_host_win.cc',
-        'remote_root_window_host_win.h',
-        'root_window_host_mac.mm',
-        'root_window_host_mac.h',
-        'root_window_host_ozone.cc',
-        'root_window_host_ozone.h',
-        'root_window_host_win.cc',
-        'root_window_host_win.h',
-        'root_window_host_x11.cc',
-        'root_window_host_x11.h',
+        'remote_window_tree_host_win.cc',
+        'remote_window_tree_host_win.h',
+        'window_tree_host_mac.mm',
+        'window_tree_host_mac.h',
+        'window_tree_host_ozone.cc',
+        'window_tree_host_ozone.h',
+        'window_tree_host_win.cc',
+        'window_tree_host_win.h',
+        'window_tree_host_x11.cc',
+        'window_tree_host_x11.h',
         'root_window_transformer.h',
         'root_window.cc',
         'root_window.h',
@@ -267,7 +267,7 @@
       ],
       'sources': [
         'gestures/gesture_recognizer_unittest.cc',
-        'root_window_host_x11_unittest.cc',
+        'window_tree_host_x11_unittest.cc',
         'root_window_unittest.cc',
         'test/run_all_unittests.cc',
         'window_targeter_unittest.cc',
diff --git a/ui/aura/remote_root_window_host_win.cc b/ui/aura/remote_window_tree_host_win.cc
index 8a508a7..2951571 100644
--- a/ui/aura/remote_root_window_host_win.cc
+++ b/ui/aura/remote_window_tree_host_win.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 "ui/aura/remote_root_window_host_win.h"
+#include "ui/aura/remote_window_tree_host_win.h"
 
 #include <windows.h>
 
@@ -20,9 +20,9 @@
 #include "ui/base/ime/input_method.h"
 #include "ui/base/ime/remote_input_method_win.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/base/view_prop.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/keyboard_code_conversion_win.h"
-#include "ui/base/view_prop.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/win/dpi.h"
 #include "ui/metro_viewer/metro_viewer_messages.h"
@@ -31,7 +31,7 @@ namespace aura {
 
 namespace {
 
-const char* kWindowTreeHostWinKey = "__AURA_REMOTE_ROOT_WINDOW_HOST_WIN__";
+const char* kWindowTreeHostWinKey = "__AURA_REMOTE_WINDOW_TREE_HOST_WIN__";
 
 // Sets the keystate for the virtual key passed in to down or up.
 void SetKeyState(uint8* key_states, bool key_down, uint32 virtual_key_code) {
diff --git a/ui/aura/remote_root_window_host_win.h b/ui/aura/remote_window_tree_host_win.h
index a3a7e4a..738cb17 100644
--- a/ui/aura/remote_root_window_host_win.h
+++ b/ui/aura/remote_window_tree_host_win.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 UI_AURA_REMOTE_ROOT_WINDOW_HOST_WIN_H_
-#define UI_AURA_REMOTE_ROOT_WINDOW_HOST_WIN_H_
+#ifndef UI_AURA_REMOTE_WINDOW_TREE_HOST_WIN_H_
+#define UI_AURA_REMOTE_WINDOW_TREE_HOST_WIN_H_
 
 #include <vector>
 
@@ -306,4 +306,4 @@ class AURA_EXPORT RemoteWindowTreeHostWin
 
 }  // namespace aura
 
-#endif  // UI_AURA_REMOTE_ROOT_WINDOW_HOST_WIN_H_
+#endif  // UI_AURA_REMOTE_WINDOW_TREE_HOST_WIN_H_
diff --git a/ui/aura/test/aura_test_helper.cc b/ui/aura/test/aura_test_helper.cc
index 0175eac..ffbd494 100644
--- a/ui/aura/test/aura_test_helper.cc
+++ b/ui/aura/test/aura_test_helper.cc
@@ -26,7 +26,7 @@
 #include "ui/gfx/screen.h"
 
 #if defined(USE_X11)
-#include "ui/aura/root_window_host_x11.h"
+#include "ui/aura/window_tree_host_x11.h"
 #include "ui/base/x/x11_util.h"
 #endif
 
diff --git a/ui/aura/window_tree_host.h b/ui/aura/window_tree_host.h
index c6fd308..cc5e8b3 100644
--- a/ui/aura/window_tree_host.h
+++ b/ui/aura/window_tree_host.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 UI_AURA_ROOT_WINDOW_HOST_H_
-#define UI_AURA_ROOT_WINDOW_HOST_H_
+#ifndef UI_AURA_WINDOW_TREE_HOST_H_
+#define UI_AURA_WINDOW_TREE_HOST_H_
 
 #include <vector>
 
@@ -173,4 +173,4 @@ class AURA_EXPORT WindowTreeHost {
 
 }  // namespace aura
 
-#endif  // UI_AURA_ROOT_WINDOW_HOST_H_
+#endif  // UI_AURA_WINDOW_TREE_HOST_H_
diff --git a/ui/aura/window_tree_host_delegate.h b/ui/aura/window_tree_host_delegate.h
index bde25d8..eeccb2c 100644
--- a/ui/aura/window_tree_host_delegate.h
+++ b/ui/aura/window_tree_host_delegate.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 UI_AURA_ROOT_WINDOW_HOST_DELEGATE_H_
-#define UI_AURA_ROOT_WINDOW_HOST_DELEGATE_H_
+#ifndef UI_AURA_WINDOW_TREE_HOST_DELEGATE_H_
+#define UI_AURA_WINDOW_TREE_HOST_DELEGATE_H_
 
 #include "ui/aura/aura_export.h"
 
@@ -56,4 +56,4 @@ class AURA_EXPORT WindowTreeHostDelegate {
 
 }  // namespace aura
 
-#endif  // UI_AURA_ROOT_WINDOW_HOST_DELEGATE_H_
+#endif  // UI_AURA_WINDOW_TREE_HOST_DELEGATE_H_
diff --git a/ui/aura/root_window_host_mac.h b/ui/aura/window_tree_host_mac.h
index 7cbf082..bdd072f 100644
--- a/ui/aura/root_window_host_mac.h
+++ b/ui/aura/window_tree_host_mac.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 UI_AURA_ROOT_WINDOW_HOST_MAC_H_
-#define UI_AURA_ROOT_WINDOW_HOST_MAC_H_
+#ifndef UI_AURA_WINDOW_TREE_HOST_MAC_H_
+#define UI_AURA_WINDOW_TREE_HOST_MAC_H_
 
 #include <vector>
 
@@ -60,4 +60,4 @@ class AURA_EXPORT WindowTreeHostMac : public WindowTreeHost {
 
 }  // namespace aura
 
-#endif  // UI_AURA_ROOT_WINDOW_HOST_MAC_H_
+#endif  // UI_AURA_WINDOW_TREE_HOST_MAC_H_
diff --git a/ui/aura/root_window_host_mac.mm b/ui/aura/window_tree_host_mac.mm
index 3f18f17..2dd3ded 100644
--- a/ui/aura/root_window_host_mac.mm
+++ b/ui/aura/window_tree_host_mac.mm
@@ -4,7 +4,7 @@
 
 #include <Cocoa/Cocoa.h>
 
-#include "ui/aura/root_window_host_mac.h"
+#include "ui/aura/window_tree_host_mac.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/aura/window_tree_host_delegate.h"
 
diff --git a/ui/aura/root_window_host_ozone.cc b/ui/aura/window_tree_host_ozone.cc
index d1ef074..4458965 100644
--- a/ui/aura/root_window_host_ozone.cc
+++ b/ui/aura/window_tree_host_ozone.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 "ui/aura/root_window_host_ozone.h"
+#include "ui/aura/window_tree_host_ozone.h"
 
 #include "ui/aura/root_window.h"
 #include "ui/events/ozone/event_factory_ozone.h"
diff --git a/ui/aura/root_window_host_ozone.h b/ui/aura/window_tree_host_ozone.h
index ca8226d..3529ac6 100644
--- a/ui/aura/root_window_host_ozone.h
+++ b/ui/aura/window_tree_host_ozone.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 UI_AURA_ROOT_WINDOW_HOST_OZONE_H_
-#define UI_AURA_ROOT_WINDOW_HOST_OZONE_H_
+#ifndef UI_AURA_WINDOW_TREE_HOST_OZONE_H_
+#define UI_AURA_WINDOW_TREE_HOST_OZONE_H_
 
 #include <vector>
 
@@ -61,4 +61,4 @@ class WindowTreeHostOzone : public WindowTreeHost,
 
 }  // namespace aura
 
-#endif  // UI_AURA_ROOT_WINDOW_HOST_OZONE_H_
+#endif  // UI_AURA_WINDOW_TREE_HOST_OZONE_H_
diff --git a/ui/aura/root_window_host_win.cc b/ui/aura/window_tree_host_win.cc
index 1c7054f..6ae1933 100644
--- a/ui/aura/root_window_host_win.cc
+++ b/ui/aura/window_tree_host_win.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 "ui/aura/root_window_host_win.h"
+#include "ui/aura/window_tree_host_win.h"
 
 #include <windows.h>
 
@@ -12,8 +12,8 @@
 #include "ui/aura/client/cursor_client.h"
 #include "ui/aura/root_window.h"
 #include "ui/base/cursor/cursor_loader_win.h"
-#include "ui/events/event.h"
 #include "ui/base/view_prop.h"
+#include "ui/events/event.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/screen.h"
diff --git a/ui/aura/root_window_host_win.h b/ui/aura/window_tree_host_win.h
index 96f3e35..86976f5 100644
--- a/ui/aura/root_window_host_win.h
+++ b/ui/aura/window_tree_host_win.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 UI_AURA_ROOT_WINDOW_HOST_WIN_H_
-#define UI_AURA_ROOT_WINDOW_HOST_WIN_H_
+#ifndef UI_AURA_WINDOW_TREE_HOST_WIN_H_
+#define UI_AURA_WINDOW_TREE_HOST_WIN_H_
 
 #include "base/compiler_specific.h"
 #include "ui/aura/aura_export.h"
@@ -101,4 +101,4 @@ AURA_EXPORT void SetUsePopupAsRootWindowForTest(bool use);
 
 }  // namespace aura
 
-#endif  // UI_AURA_ROOT_WINDOW_HOST_WIN_H_
+#endif  // UI_AURA_WINDOW_TREE_HOST_WIN_H_
diff --git a/ui/aura/root_window_host_x11.cc b/ui/aura/window_tree_host_x11.cc
index 44e3fa2..7fdb3ce6 100644
--- a/ui/aura/root_window_host_x11.cc
+++ b/ui/aura/window_tree_host_x11.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 "ui/aura/root_window_host_x11.h"
+#include "ui/aura/window_tree_host_x11.h"
 
 #include <strings.h>
 #include <X11/cursorfont.h>
diff --git a/ui/aura/root_window_host_x11.h b/ui/aura/window_tree_host_x11.h
index f480205..d0b7b3b 100644
--- a/ui/aura/root_window_host_x11.h
+++ b/ui/aura/window_tree_host_x11.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 UI_AURA_ROOT_WINDOW_HOST_X11_H_
-#define UI_AURA_ROOT_WINDOW_HOST_X11_H_
+#ifndef UI_AURA_WINDOW_TREE_HOST_X11_H_
+#define UI_AURA_WINDOW_TREE_HOST_X11_H_
 
 #include <X11/Xlib.h>
 
@@ -147,4 +147,4 @@ AURA_EXPORT void SetUseOverrideRedirectWindowByDefault(bool override_redirect);
 }  // namespace test
 }  // namespace aura
 
-#endif  // UI_AURA_ROOT_WINDOW_HOST_X11_H_
+#endif  // UI_AURA_WINDOW_TREE_HOST_X11_H_
diff --git a/ui/aura/root_window_host_x11_unittest.cc b/ui/aura/window_tree_host_x11_unittest.cc
index 4efb8fd..9af33ef 100644
--- a/ui/aura/root_window_host_x11_unittest.cc
+++ b/ui/aura/window_tree_host_x11_unittest.cc
@@ -6,9 +6,9 @@
 #include "base/sys_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/root_window.h"
-#include "ui/aura/root_window_host_x11.h"
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/aura/window_tree_host_delegate.h"
+#include "ui/aura/window_tree_host_x11.h"
 #include "ui/events/event_processor.h"
 #include "ui/events/event_target.h"
 #include "ui/events/event_target_iterator.h"
@@ -99,11 +99,11 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) {
   base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 #endif  // defined(OS_CHROMEOS)
 
-  scoped_ptr<WindowTreeHostX11> root_window_host(
+  scoped_ptr<WindowTreeHostX11> window_tree_host(
       new WindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700)));
   scoped_ptr<TestWindowTreeHostDelegate> delegate(
       new TestWindowTreeHostDelegate());
-  root_window_host->set_delegate(delegate.get());
+  window_tree_host->set_delegate(delegate.get());
 
   std::vector<unsigned int> devices;
   devices.push_back(0);
@@ -118,7 +118,7 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) {
   // This touch is out of bounds.
   scoped_xevent.InitTouchEvent(
       0, XI_TouchBegin, 5, gfx::Point(1500, 2500), valuators);
-  root_window_host->Dispatch(scoped_xevent);
+  window_tree_host->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_UNKNOWN, delegate->last_touch_type());
   EXPECT_EQ(-1, delegate->last_touch_id());
   EXPECT_EQ(gfx::Point(0, 0), delegate->last_touch_location());
@@ -127,21 +127,21 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToOneRootWindow) {
   // Following touchs are within bounds and are passed to delegate.
   scoped_xevent.InitTouchEvent(
       0, XI_TouchBegin, 5, gfx::Point(1500, 1500), valuators);
-  root_window_host->Dispatch(scoped_xevent);
+  window_tree_host->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_TOUCH_PRESSED, delegate->last_touch_type());
   EXPECT_EQ(0, delegate->last_touch_id());
   EXPECT_EQ(gfx::Point(1500, 1500), delegate->last_touch_location());
 
   scoped_xevent.InitTouchEvent(
       0, XI_TouchUpdate, 5, gfx::Point(1500, 1600), valuators);
-  root_window_host->Dispatch(scoped_xevent);
+  window_tree_host->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_TOUCH_MOVED, delegate->last_touch_type());
   EXPECT_EQ(0, delegate->last_touch_id());
   EXPECT_EQ(gfx::Point(1500, 1600), delegate->last_touch_location());
 
   scoped_xevent.InitTouchEvent(
       0, XI_TouchEnd, 5, gfx::Point(1500, 1600), valuators);
-  root_window_host->Dispatch(scoped_xevent);
+  window_tree_host->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_TOUCH_RELEASED, delegate->last_touch_type());
   EXPECT_EQ(0, delegate->last_touch_id());
   EXPECT_EQ(gfx::Point(1500, 1600), delegate->last_touch_location());
@@ -164,18 +164,18 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
   const char* kLsbRelease = "CHROMEOS_RELEASE_NAME=Chromium OS\n";
   base::SysInfo::SetChromeOSVersionInfoForTest(kLsbRelease, base::Time());
 
-  scoped_ptr<WindowTreeHostX11> root_window_host1(
+  scoped_ptr<WindowTreeHostX11> window_tree_host1(
       new WindowTreeHostX11(gfx::Rect(0, 0, 2560, 1700)));
   scoped_ptr<TestWindowTreeHostDelegate> delegate1(
       new TestWindowTreeHostDelegate());
-  root_window_host1->set_delegate(delegate1.get());
+  window_tree_host1->set_delegate(delegate1.get());
 
   int host2_y_offset = 1700;
-  scoped_ptr<WindowTreeHostX11> root_window_host2(
+  scoped_ptr<WindowTreeHostX11> window_tree_host2(
       new WindowTreeHostX11(gfx::Rect(0, host2_y_offset, 1920, 1080)));
   scoped_ptr<TestWindowTreeHostDelegate> delegate2(
       new TestWindowTreeHostDelegate());
-  root_window_host2->set_delegate(delegate2.get());
+  window_tree_host2->set_delegate(delegate2.get());
 
   std::vector<unsigned int> devices;
   devices.push_back(0);
@@ -191,8 +191,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
   ui::ScopedXI2Event scoped_xevent;
   scoped_xevent.InitTouchEvent(
       0, XI_TouchBegin, 5, gfx::Point(1500, 2500), valuators);
-  root_window_host1->Dispatch(scoped_xevent);
-  root_window_host2->Dispatch(scoped_xevent);
+  window_tree_host1->Dispatch(scoped_xevent);
+  window_tree_host2->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type());
   EXPECT_EQ(-1, delegate1->last_touch_id());
   EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location());
@@ -203,8 +203,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
 
   scoped_xevent.InitTouchEvent(
       0, XI_TouchBegin, 6, gfx::Point(1600, 2600), valuators);
-  root_window_host1->Dispatch(scoped_xevent);
-  root_window_host2->Dispatch(scoped_xevent);
+  window_tree_host1->Dispatch(scoped_xevent);
+  window_tree_host2->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type());
   EXPECT_EQ(-1, delegate1->last_touch_id());
   EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location());
@@ -215,8 +215,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
 
   scoped_xevent.InitTouchEvent(
       0, XI_TouchUpdate, 5, gfx::Point(1500, 2550), valuators);
-  root_window_host1->Dispatch(scoped_xevent);
-  root_window_host2->Dispatch(scoped_xevent);
+  window_tree_host1->Dispatch(scoped_xevent);
+  window_tree_host2->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type());
   EXPECT_EQ(-1, delegate1->last_touch_id());
   EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location());
@@ -227,8 +227,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
 
   scoped_xevent.InitTouchEvent(
       0, XI_TouchUpdate, 6, gfx::Point(1600, 2650), valuators);
-  root_window_host1->Dispatch(scoped_xevent);
-  root_window_host2->Dispatch(scoped_xevent);
+  window_tree_host1->Dispatch(scoped_xevent);
+  window_tree_host2->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type());
   EXPECT_EQ(-1, delegate1->last_touch_id());
   EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location());
@@ -239,8 +239,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
 
   scoped_xevent.InitTouchEvent(
       0, XI_TouchEnd, 5, gfx::Point(1500, 2550), valuators);
-  root_window_host1->Dispatch(scoped_xevent);
-  root_window_host2->Dispatch(scoped_xevent);
+  window_tree_host1->Dispatch(scoped_xevent);
+  window_tree_host2->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type());
   EXPECT_EQ(-1, delegate1->last_touch_id());
   EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location());
@@ -251,8 +251,8 @@ TEST_F(WindowTreeHostX11Test, DispatchTouchEventToTwoRootWindow) {
 
   scoped_xevent.InitTouchEvent(
       0, XI_TouchEnd, 6, gfx::Point(1600, 2650), valuators);
-  root_window_host1->Dispatch(scoped_xevent);
-  root_window_host2->Dispatch(scoped_xevent);
+  window_tree_host1->Dispatch(scoped_xevent);
+  window_tree_host2->Dispatch(scoped_xevent);
   EXPECT_EQ(ui::ET_UNKNOWN, delegate1->last_touch_type());
   EXPECT_EQ(-1, delegate1->last_touch_id());
   EXPECT_EQ(gfx::Point(0, 0), delegate1->last_touch_location());