Revert 236048 "Rename RootWindowHost* to WindowTreeHost*"

trunk/src/ui/aura/remote_root_window_host_win.cc

Index: trunk/src/ui/aura/remote_root_window_host_win.cc
===================================================================
--- trunk/src/ui/aura/remote_root_window_host_win.cc	(revision 236091)
+++ trunk/src/ui/aura/remote_root_window_host_win.cc	(working copy)
@@ -24,7 +24,7 @@
 
 namespace {
 
-const char* kWindowTreeHostWinKey = "__AURA_REMOTE_ROOT_WINDOW_HOST_WIN__";
+const char* kRootWindowHostWinKey = "__AURA_REMOTE_ROOT_WINDOW_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) {
@@ -61,8 +61,8 @@
                     const base::string16& filter,
                     const OpenFileCompletion& on_success,
                     const FileSelectionCanceled& on_failure) {
-  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
-  aura::RemoteWindowTreeHostWin::Instance()->HandleOpenFile(title,
+  DCHECK(aura::RemoteRootWindowHostWin::Instance());
+  aura::RemoteRootWindowHostWin::Instance()->HandleOpenFile(title,
                                                             default_path,
                                                             filter,
                                                             on_success,
@@ -74,8 +74,8 @@
                              const base::string16& filter,
                              const OpenMultipleFilesCompletion& on_success,
                              const FileSelectionCanceled& on_failure) {
-  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
-  aura::RemoteWindowTreeHostWin::Instance()->HandleOpenMultipleFiles(
+  DCHECK(aura::RemoteRootWindowHostWin::Instance());
+  aura::RemoteRootWindowHostWin::Instance()->HandleOpenMultipleFiles(
       title,
       default_path,
       filter,
@@ -90,8 +90,8 @@
                     const base::string16& default_extension,
                     const SaveFileCompletion& on_success,
                     const FileSelectionCanceled& on_failure) {
-  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
-  aura::RemoteWindowTreeHostWin::Instance()->HandleSaveFile(title,
+  DCHECK(aura::RemoteRootWindowHostWin::Instance());
+  aura::RemoteRootWindowHostWin::Instance()->HandleSaveFile(title,
                                                             default_path,
                                                             filter,
                                                             filter_index,
@@ -103,62 +103,62 @@
 void HandleSelectFolder(const base::string16& title,
                         const SelectFolderCompletion& on_success,
                         const FileSelectionCanceled& on_failure) {
-  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
-  aura::RemoteWindowTreeHostWin::Instance()->HandleSelectFolder(title,
+  DCHECK(aura::RemoteRootWindowHostWin::Instance());
+  aura::RemoteRootWindowHostWin::Instance()->HandleSelectFolder(title,
                                                                 on_success,
                                                                 on_failure);
 }
 
 void HandleActivateDesktop(const base::FilePath& shortcut,
                            const ActivateDesktopCompleted& on_success) {
-  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
-  aura::RemoteWindowTreeHostWin::Instance()->HandleActivateDesktop(shortcut,
+  DCHECK(aura::RemoteRootWindowHostWin::Instance());
+  aura::RemoteRootWindowHostWin::Instance()->HandleActivateDesktop(shortcut,
                                                                    on_success);
 }
 
-RemoteWindowTreeHostWin* g_instance = NULL;
+RemoteRootWindowHostWin* g_instance = NULL;
 
-RemoteWindowTreeHostWin* RemoteWindowTreeHostWin::Instance() {
+RemoteRootWindowHostWin* RemoteRootWindowHostWin::Instance() {
   if (g_instance)
     return g_instance;
   return Create(gfx::Rect());
 }
 
-RemoteWindowTreeHostWin* RemoteWindowTreeHostWin::Create(
+RemoteRootWindowHostWin* RemoteRootWindowHostWin::Create(
     const gfx::Rect& bounds) {
-  g_instance = g_instance ? g_instance : new RemoteWindowTreeHostWin(bounds);
+  g_instance = g_instance ? g_instance : new RemoteRootWindowHostWin(bounds);
   return g_instance;
 }
 
-RemoteWindowTreeHostWin::RemoteWindowTreeHostWin(const gfx::Rect& bounds)
+RemoteRootWindowHostWin::RemoteRootWindowHostWin(const gfx::Rect& bounds)
     : remote_window_(NULL),
       host_(NULL),
       ignore_mouse_moves_until_set_cursor_ack_(false),
       event_flags_(0) {
-  prop_.reset(new ui::ViewProp(NULL, kWindowTreeHostWinKey, this));
+  prop_.reset(new ui::ViewProp(NULL, kRootWindowHostWinKey, this));
   CreateCompositor(GetAcceleratedWidget());
 }
 
-RemoteWindowTreeHostWin::~RemoteWindowTreeHostWin() {
+RemoteRootWindowHostWin::~RemoteRootWindowHostWin() {
   g_instance = NULL;
 }
 
-void RemoteWindowTreeHostWin::Connected(IPC::Sender* host, HWND remote_window) {
+void RemoteRootWindowHostWin::Connected(IPC::Sender* host, HWND remote_window) {
   CHECK(host_ == NULL);
   host_ = host;
   remote_window_ = remote_window;
 }
 
-void RemoteWindowTreeHostWin::Disconnected() {
+void RemoteRootWindowHostWin::Disconnected() {
   // Don't CHECK here, Disconnected is called on a channel error which can
   // happen before we're successfully Connected.
   host_ = NULL;
   remote_window_ = NULL;
 }
 
-bool RemoteWindowTreeHostWin::OnMessageReceived(const IPC::Message& message) {
+bool RemoteRootWindowHostWin::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(RemoteWindowTreeHostWin, message)
+  IPC_BEGIN_MESSAGE_MAP(RemoteRootWindowHostWin, message)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_MouseMoved, OnMouseMoved)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_MouseButton, OnMouseButton)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_KeyDown, OnKeyDown)
@@ -191,7 +191,7 @@
   return handled;
 }
 
-void RemoteWindowTreeHostWin::HandleOpenURLOnDesktop(
+void RemoteRootWindowHostWin::HandleOpenURLOnDesktop(
     const base::FilePath& shortcut,
     const base::string16& url) {
   if (!host_)
@@ -199,7 +199,7 @@
   host_->Send(new MetroViewerHostMsg_OpenURLOnDesktop(shortcut, url));
 }
 
-void RemoteWindowTreeHostWin::HandleActivateDesktop(
+void RemoteRootWindowHostWin::HandleActivateDesktop(
     const base::FilePath& shortcut,
     const ActivateDesktopCompleted& on_success) {
   if (!host_)
@@ -209,7 +209,7 @@
   host_->Send(new MetroViewerHostMsg_ActivateDesktop(shortcut));
 }
 
-void RemoteWindowTreeHostWin::HandleOpenFile(
+void RemoteRootWindowHostWin::HandleOpenFile(
     const base::string16& title,
     const base::FilePath& default_path,
     const base::string16& filter,
@@ -231,7 +231,7 @@
                                                      false));
 }
 
-void RemoteWindowTreeHostWin::HandleOpenMultipleFiles(
+void RemoteRootWindowHostWin::HandleOpenMultipleFiles(
     const base::string16& title,
     const base::FilePath& default_path,
     const base::string16& filter,
@@ -252,7 +252,7 @@
                                                      true));
 }
 
-void RemoteWindowTreeHostWin::HandleSaveFile(
+void RemoteRootWindowHostWin::HandleSaveFile(
     const base::string16& title,
     const base::FilePath& default_path,
     const base::string16& filter,
@@ -279,7 +279,7 @@
   host_->Send(new MetroViewerHostMsg_DisplayFileSaveAs(params));
 }
 
-void RemoteWindowTreeHostWin::HandleSelectFolder(
+void RemoteRootWindowHostWin::HandleSelectFolder(
     const base::string16& title,
     const SelectFolderCompletion& on_success,
     const FileSelectionCanceled& on_failure) {
@@ -295,69 +295,69 @@
   host_->Send(new MetroViewerHostMsg_DisplaySelectFolder(title));
 }
 
-bool RemoteWindowTreeHostWin::IsForegroundWindow() {
+bool RemoteRootWindowHostWin::IsForegroundWindow() {
   return ::GetForegroundWindow() == remote_window_;
 }
 
-Window* RemoteWindowTreeHostWin::GetAshWindow() {
+Window* RemoteRootWindowHostWin::GetAshWindow() {
   return GetRootWindow()->window();
 }
 
-RootWindow* RemoteWindowTreeHostWin::GetRootWindow() {
+RootWindow* RemoteRootWindowHostWin::GetRootWindow() {
   return delegate_->AsRootWindow();
 }
 
-gfx::AcceleratedWidget RemoteWindowTreeHostWin::GetAcceleratedWidget() {
+gfx::AcceleratedWidget RemoteRootWindowHostWin::GetAcceleratedWidget() {
   if (remote_window_)
     return remote_window_;
   // Getting here should only happen for ash_unittests.exe and related code.
   return ::GetDesktopWindow();
 }
 
-void RemoteWindowTreeHostWin::Show() {
+void RemoteRootWindowHostWin::Show() {
 }
 
-void RemoteWindowTreeHostWin::Hide() {
+void RemoteRootWindowHostWin::Hide() {
   NOTIMPLEMENTED();
 }
 
-void RemoteWindowTreeHostWin::ToggleFullScreen() {
+void RemoteRootWindowHostWin::ToggleFullScreen() {
 }
 
-gfx::Rect RemoteWindowTreeHostWin::GetBounds() const {
-  gfx::Rect r(gfx::Point(0, 0), aura::WindowTreeHost::GetNativeScreenSize());
+gfx::Rect RemoteRootWindowHostWin::GetBounds() const {
+  gfx::Rect r(gfx::Point(0, 0), aura::RootWindowHost::GetNativeScreenSize());
   return r;
 }
 
-void RemoteWindowTreeHostWin::SetBounds(const gfx::Rect& bounds) {
+void RemoteRootWindowHostWin::SetBounds(const gfx::Rect& bounds) {
   NotifyHostResized(bounds.size());
 }
 
-gfx::Insets RemoteWindowTreeHostWin::GetInsets() const {
+gfx::Insets RemoteRootWindowHostWin::GetInsets() const {
   return gfx::Insets();
 }
 
-void RemoteWindowTreeHostWin::SetInsets(const gfx::Insets& insets) {
+void RemoteRootWindowHostWin::SetInsets(const gfx::Insets& insets) {
 }
 
-gfx::Point RemoteWindowTreeHostWin::GetLocationOnNativeScreen() const {
+gfx::Point RemoteRootWindowHostWin::GetLocationOnNativeScreen() const {
   return gfx::Point(0, 0);
 }
 
-void RemoteWindowTreeHostWin::SetCursor(gfx::NativeCursor native_cursor) {
+void RemoteRootWindowHostWin::SetCursor(gfx::NativeCursor native_cursor) {
   if (!host_)
     return;
   host_->Send(
       new MetroViewerHostMsg_SetCursor(uint64(native_cursor.platform())));
 }
 
-void RemoteWindowTreeHostWin::SetCapture() {
+void RemoteRootWindowHostWin::SetCapture() {
 }
 
-void RemoteWindowTreeHostWin::ReleaseCapture() {
+void RemoteRootWindowHostWin::ReleaseCapture() {
 }
 
-bool RemoteWindowTreeHostWin::QueryMouseLocation(gfx::Point* location_return) {
+bool RemoteRootWindowHostWin::QueryMouseLocation(gfx::Point* location_return) {
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(GetRootWindow()->window());
   if (cursor_client && !cursor_client->IsMouseEventsEnabled()) {
@@ -371,18 +371,18 @@
   return true;
 }
 
-bool RemoteWindowTreeHostWin::ConfineCursorToRootWindow() {
+bool RemoteRootWindowHostWin::ConfineCursorToRootWindow() {
   return true;
 }
 
-void RemoteWindowTreeHostWin::UnConfineCursor() {
+void RemoteRootWindowHostWin::UnConfineCursor() {
 }
 
-void RemoteWindowTreeHostWin::OnCursorVisibilityChanged(bool show) {
+void RemoteRootWindowHostWin::OnCursorVisibilityChanged(bool show) {
   NOTIMPLEMENTED();
 }
 
-void RemoteWindowTreeHostWin::MoveCursorTo(const gfx::Point& location) {
+void RemoteRootWindowHostWin::MoveCursorTo(const gfx::Point& location) {
   VLOG(1) << "In MoveCursorTo: " << location.x() << ", " << location.y();
   if (!host_)
     return;
@@ -407,19 +407,19 @@
   host_->Send(new MetroViewerHostMsg_SetCursorPos(location.x(), location.y()));
 }
 
-void RemoteWindowTreeHostWin::PostNativeEvent(
+void RemoteRootWindowHostWin::PostNativeEvent(
     const base::NativeEvent& native_event) {
 }
 
-void RemoteWindowTreeHostWin::OnDeviceScaleFactorChanged(
+void RemoteRootWindowHostWin::OnDeviceScaleFactorChanged(
     float device_scale_factor) {
   NOTIMPLEMENTED();
 }
 
-void RemoteWindowTreeHostWin::PrepareForShutdown() {
+void RemoteRootWindowHostWin::PrepareForShutdown() {
 }
 
-void RemoteWindowTreeHostWin::OnMouseMoved(int32 x, int32 y, int32 flags) {
+void RemoteRootWindowHostWin::OnMouseMoved(int32 x, int32 y, int32 flags) {
   if (ignore_mouse_moves_until_set_cursor_ack_)
     return;
 
@@ -428,7 +428,7 @@
   delegate_->OnHostMouseEvent(&event);
 }
 
-void RemoteWindowTreeHostWin::OnMouseButton(
+void RemoteRootWindowHostWin::OnMouseButton(
     int32 x,
     int32 y,
     int32 extra,
@@ -462,7 +462,7 @@
   }
 }
 
-void RemoteWindowTreeHostWin::OnKeyDown(uint32 vkey,
+void RemoteRootWindowHostWin::OnKeyDown(uint32 vkey,
                                         uint32 repeat_count,
                                         uint32 scan_code,
                                         uint32 flags) {
@@ -470,7 +470,7 @@
                           flags, false);
 }
 
-void RemoteWindowTreeHostWin::OnKeyUp(uint32 vkey,
+void RemoteRootWindowHostWin::OnKeyUp(uint32 vkey,
                                       uint32 repeat_count,
                                       uint32 scan_code,
                                       uint32 flags) {
@@ -478,7 +478,7 @@
                           flags, false);
 }
 
-void RemoteWindowTreeHostWin::OnChar(uint32 key_code,
+void RemoteRootWindowHostWin::OnChar(uint32 key_code,
                                      uint32 repeat_count,
                                      uint32 scan_code,
                                      uint32 flags) {
@@ -486,11 +486,11 @@
                           scan_code, flags, true);
 }
 
-void RemoteWindowTreeHostWin::OnWindowActivated() {
+void RemoteRootWindowHostWin::OnWindowActivated() {
   delegate_->OnHostActivated();
 }
 
-void RemoteWindowTreeHostWin::OnTouchDown(int32 x,
+void RemoteRootWindowHostWin::OnTouchDown(int32 x,
                                           int32 y,
                                           uint64 timestamp,
                                           uint32 pointer_id) {
@@ -501,7 +501,7 @@
   delegate_->OnHostTouchEvent(&event);
 }
 
-void RemoteWindowTreeHostWin::OnTouchUp(int32 x,
+void RemoteRootWindowHostWin::OnTouchUp(int32 x,
                                         int32 y,
                                         uint64 timestamp,
                                         uint32 pointer_id) {
@@ -512,7 +512,7 @@
   delegate_->OnHostTouchEvent(&event);
 }
 
-void RemoteWindowTreeHostWin::OnTouchMoved(int32 x,
+void RemoteRootWindowHostWin::OnTouchMoved(int32 x,
                                            int32 y,
                                            uint64 timestamp,
                                            uint32 pointer_id) {
@@ -523,7 +523,7 @@
   delegate_->OnHostTouchEvent(&event);
 }
 
-void RemoteWindowTreeHostWin::OnFileSaveAsDone(bool success,
+void RemoteRootWindowHostWin::OnFileSaveAsDone(bool success,
                                                const base::FilePath& filename,
                                                int filter_index) {
   if (success)
@@ -535,7 +535,7 @@
 }
 
 
-void RemoteWindowTreeHostWin::OnFileOpenDone(bool success,
+void RemoteRootWindowHostWin::OnFileOpenDone(bool success,
                                              const base::FilePath& filename) {
   if (success)
     file_open_completion_callback_.Run(base::FilePath(filename), 0, NULL);
@@ -545,7 +545,7 @@
   failure_callback_.Reset();
 }
 
-void RemoteWindowTreeHostWin::OnMultiFileOpenDone(
+void RemoteRootWindowHostWin::OnMultiFileOpenDone(
     bool success,
     const std::vector<base::FilePath>& files) {
   if (success)
@@ -556,7 +556,7 @@
   failure_callback_.Reset();
 }
 
-void RemoteWindowTreeHostWin::OnSelectFolderDone(
+void RemoteRootWindowHostWin::OnSelectFolderDone(
     bool success,
     const base::FilePath& folder) {
   if (success)
@@ -567,22 +567,22 @@
   failure_callback_.Reset();
 }
 
-void RemoteWindowTreeHostWin::OnSetCursorPosAck() {
+void RemoteRootWindowHostWin::OnSetCursorPosAck() {
   DCHECK(ignore_mouse_moves_until_set_cursor_ack_);
   ignore_mouse_moves_until_set_cursor_ack_ = false;
 }
 
-void RemoteWindowTreeHostWin::OnWindowSizeChanged(uint32 width, uint32 height) {
+void RemoteRootWindowHostWin::OnWindowSizeChanged(uint32 width, uint32 height) {
   SetBounds(gfx::Rect(0, 0, width, height));
 }
 
-void RemoteWindowTreeHostWin::OnDesktopActivated() {
+void RemoteRootWindowHostWin::OnDesktopActivated() {
   ActivateDesktopCompleted temp = activate_completed_callback_;
   activate_completed_callback_.Reset();
   temp.Run();
 }
 
-void RemoteWindowTreeHostWin::DispatchKeyboardMessage(ui::EventType type,
+void RemoteRootWindowHostWin::DispatchKeyboardMessage(ui::EventType type,
                                                       uint32 vkey,
                                                       uint32 repeat_count,
                                                       uint32 scan_code,
@@ -605,7 +605,7 @@
   }
 }
 
-void RemoteWindowTreeHostWin::SetEventFlags(uint32 flags) {
+void RemoteRootWindowHostWin::SetEventFlags(uint32 flags) {
   if (flags == event_flags_)
     return;
   event_flags_ = flags;