Rename RootWindowHost to WindowTreeHost

ui/aura/remote_root_window_host_win.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // 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 <windows.h>
 
 #include <algorithm>
 
@@ skipping 13 matching lines @@
 #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"
 
 namespace aura {
 
 namespace {
 
-const char* kRootWindowHostWinKey = "__AURA_REMOTE_ROOT_WINDOW_HOST_WIN__";
+const char* kWindowTreeHostWinKey = "__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) {
   DCHECK(key_states);
 
   if (key_down)
     key_states[virtual_key_code] |= 0x80;
   else
     key_states[virtual_key_code] &= 0x7F;
 }
@@ skipping 35 matching lines @@
   }
 }
 
 }  // namespace
 
 void HandleOpenFile(const base::string16& title,
                     const base::FilePath& default_path,
                     const base::string16& filter,
                     const OpenFileCompletion& on_success,
                     const FileSelectionCanceled& on_failure) {
-  DCHECK(aura::RemoteRootWindowHostWin::Instance());
-  aura::RemoteRootWindowHostWin::Instance()->HandleOpenFile(title,
+  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
+  aura::RemoteWindowTreeHostWin::Instance()->HandleOpenFile(title,
                                                             default_path,
                                                             filter,
                                                             on_success,
                                                             on_failure);
 }
 
 void HandleOpenMultipleFiles(const base::string16& title,
                              const base::FilePath& default_path,
                              const base::string16& filter,
                              const OpenMultipleFilesCompletion& on_success,
                              const FileSelectionCanceled& on_failure) {
-  DCHECK(aura::RemoteRootWindowHostWin::Instance());
-  aura::RemoteRootWindowHostWin::Instance()->HandleOpenMultipleFiles(
+  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
+  aura::RemoteWindowTreeHostWin::Instance()->HandleOpenMultipleFiles(
       title,
       default_path,
       filter,
       on_success,
       on_failure);
 }
 
 void HandleSaveFile(const base::string16& title,
                     const base::FilePath& default_path,
                     const base::string16& filter,
                     int filter_index,
                     const base::string16& default_extension,
                     const SaveFileCompletion& on_success,
                     const FileSelectionCanceled& on_failure) {
-  DCHECK(aura::RemoteRootWindowHostWin::Instance());
-  aura::RemoteRootWindowHostWin::Instance()->HandleSaveFile(title,
+  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
+  aura::RemoteWindowTreeHostWin::Instance()->HandleSaveFile(title,
                                                             default_path,
                                                             filter,
                                                             filter_index,
                                                             default_extension,
                                                             on_success,
                                                             on_failure);
 }
 
 void HandleSelectFolder(const base::string16& title,
                         const SelectFolderCompletion& on_success,
                         const FileSelectionCanceled& on_failure) {
-  DCHECK(aura::RemoteRootWindowHostWin::Instance());
-  aura::RemoteRootWindowHostWin::Instance()->HandleSelectFolder(title,
+  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
+  aura::RemoteWindowTreeHostWin::Instance()->HandleSelectFolder(title,
                                                                 on_success,
                                                                 on_failure);
 }
 
 void HandleActivateDesktop(const base::FilePath& shortcut,
                            bool ash_exit) {
-  DCHECK(aura::RemoteRootWindowHostWin::Instance());
-  aura::RemoteRootWindowHostWin::Instance()->HandleActivateDesktop(shortcut,
+  DCHECK(aura::RemoteWindowTreeHostWin::Instance());
+  aura::RemoteWindowTreeHostWin::Instance()->HandleActivateDesktop(shortcut,
                                                                    ash_exit);
 }
 
-RemoteRootWindowHostWin* g_instance = NULL;
+RemoteWindowTreeHostWin* g_instance = NULL;
 
-RemoteRootWindowHostWin* RemoteRootWindowHostWin::Instance() {
+RemoteWindowTreeHostWin* RemoteWindowTreeHostWin::Instance() {
   if (g_instance)
     return g_instance;
   return Create(gfx::Rect());
 }
 
-RemoteRootWindowHostWin* RemoteRootWindowHostWin::Create(
+RemoteWindowTreeHostWin* RemoteWindowTreeHostWin::Create(
     const gfx::Rect& bounds) {
-  g_instance = g_instance ? g_instance : new RemoteRootWindowHostWin(bounds);
+  g_instance = g_instance ? g_instance : new RemoteWindowTreeHostWin(bounds);
   return g_instance;
 }
 
-RemoteRootWindowHostWin::RemoteRootWindowHostWin(const gfx::Rect& bounds)
+RemoteWindowTreeHostWin::RemoteWindowTreeHostWin(const gfx::Rect& bounds)
     : remote_window_(NULL),
       host_(NULL),
       ignore_mouse_moves_until_set_cursor_ack_(false),
       event_flags_(0),
-      window_size_(aura::RootWindowHost::GetNativeScreenSize()) {
-  prop_.reset(new ui::ViewProp(NULL, kRootWindowHostWinKey, this));
+      window_size_(aura::WindowTreeHost::GetNativeScreenSize()) {
+  prop_.reset(new ui::ViewProp(NULL, kWindowTreeHostWinKey, this));
   CreateCompositor(GetAcceleratedWidget());
 }
 
-RemoteRootWindowHostWin::~RemoteRootWindowHostWin() {
+RemoteWindowTreeHostWin::~RemoteWindowTreeHostWin() {
   g_instance = NULL;
 }
 
-void RemoteRootWindowHostWin::Connected(IPC::Sender* host, HWND remote_window) {
+void RemoteWindowTreeHostWin::Connected(IPC::Sender* host, HWND remote_window) {
   CHECK(host_ == NULL);
   host_ = host;
   remote_window_ = remote_window;
   // Recreate the compositor for the target surface represented by the
   // remote_window HWND.
   CreateCompositor(remote_window_);
   InitCompositor();
 }
 
-void RemoteRootWindowHostWin::Disconnected() {
+void RemoteWindowTreeHostWin::Disconnected() {
   // Don't CHECK here, Disconnected is called on a channel error which can
   // happen before we're successfully Connected.
   if (!host_)
     return;
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
   if (remote_input_method_private)
     remote_input_method_private->SetRemoteDelegate(NULL);
   host_ = NULL;
   remote_window_ = NULL;
 }
 
-bool RemoteRootWindowHostWin::OnMessageReceived(const IPC::Message& message) {
+bool RemoteWindowTreeHostWin::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(RemoteRootWindowHostWin, message)
+  IPC_BEGIN_MESSAGE_MAP(RemoteWindowTreeHostWin, message)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_MouseMoved, OnMouseMoved)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_MouseButton, OnMouseButton)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_KeyDown, OnKeyDown)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_KeyUp, OnKeyUp)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_Character, OnChar)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_WindowActivated,
                         OnWindowActivated)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_TouchDown,
                         OnTouchDown)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_TouchUp,
@@ skipping 16 matching lines @@
                         OnImeCompositionChanged)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_ImeTextCommitted,
                         OnImeTextCommitted)
     IPC_MESSAGE_HANDLER(MetroViewerHostMsg_ImeInputSourceChanged,
                         OnImeInputSourceChanged)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void RemoteRootWindowHostWin::HandleOpenURLOnDesktop(
+void RemoteWindowTreeHostWin::HandleOpenURLOnDesktop(
     const base::FilePath& shortcut,
     const base::string16& url) {
   if (!host_)
     return;
   host_->Send(new MetroViewerHostMsg_OpenURLOnDesktop(shortcut, url));
 }
 
-void RemoteRootWindowHostWin::HandleActivateDesktop(
+void RemoteWindowTreeHostWin::HandleActivateDesktop(
     const base::FilePath& shortcut,
     bool ash_exit) {
   if (!host_)
     return;
   host_->Send(new MetroViewerHostMsg_ActivateDesktop(shortcut, ash_exit));
 }
 
-void RemoteRootWindowHostWin::HandleOpenFile(
+void RemoteWindowTreeHostWin::HandleOpenFile(
     const base::string16& title,
     const base::FilePath& default_path,
     const base::string16& filter,
     const OpenFileCompletion& on_success,
     const FileSelectionCanceled& on_failure) {
   if (!host_)
     return;
 
   // Can only have one of these operations in flight.
   DCHECK(file_open_completion_callback_.is_null());
   DCHECK(failure_callback_.is_null());
 
   file_open_completion_callback_ = on_success;
   failure_callback_ = on_failure;
 
   host_->Send(new MetroViewerHostMsg_DisplayFileOpen(title,
                                                      filter,
                                                      default_path,
                                                      false));
 }
 
-void RemoteRootWindowHostWin::HandleOpenMultipleFiles(
+void RemoteWindowTreeHostWin::HandleOpenMultipleFiles(
     const base::string16& title,
     const base::FilePath& default_path,
     const base::string16& filter,
     const OpenMultipleFilesCompletion& on_success,
     const FileSelectionCanceled& on_failure) {
   if (!host_)
     return;
 
   // Can only have one of these operations in flight.
   DCHECK(multi_file_open_completion_callback_.is_null());
   DCHECK(failure_callback_.is_null());
   multi_file_open_completion_callback_ = on_success;
   failure_callback_ = on_failure;
 
   host_->Send(new MetroViewerHostMsg_DisplayFileOpen(title,
                                                      filter,
                                                      default_path,
                                                      true));
 }
 
-void RemoteRootWindowHostWin::HandleSaveFile(
+void RemoteWindowTreeHostWin::HandleSaveFile(
     const base::string16& title,
     const base::FilePath& default_path,
     const base::string16& filter,
     int filter_index,
     const base::string16& default_extension,
     const SaveFileCompletion& on_success,
     const FileSelectionCanceled& on_failure) {
   if (!host_)
     return;
 
   MetroViewerHostMsg_SaveAsDialogParams params;
   params.title = title;
   params.default_extension = default_extension;
   params.filter = filter;
   params.filter_index = filter_index;
   params.suggested_name = default_path;
 
   // Can only have one of these operations in flight.
   DCHECK(file_saveas_completion_callback_.is_null());
   DCHECK(failure_callback_.is_null());
   file_saveas_completion_callback_ = on_success;
   failure_callback_ = on_failure;
 
   host_->Send(new MetroViewerHostMsg_DisplayFileSaveAs(params));
 }
 
-void RemoteRootWindowHostWin::HandleSelectFolder(
+void RemoteWindowTreeHostWin::HandleSelectFolder(
     const base::string16& title,
     const SelectFolderCompletion& on_success,
     const FileSelectionCanceled& on_failure) {
   if (!host_)
     return;
 
   // Can only have one of these operations in flight.
   DCHECK(select_folder_completion_callback_.is_null());
   DCHECK(failure_callback_.is_null());
   select_folder_completion_callback_ = on_success;
   failure_callback_ = on_failure;
 
   host_->Send(new MetroViewerHostMsg_DisplaySelectFolder(title));
 }
 
-void RemoteRootWindowHostWin::HandleWindowSizeChanged(uint32 width,
+void RemoteWindowTreeHostWin::HandleWindowSizeChanged(uint32 width,
                                                       uint32 height) {
   SetBounds(gfx::Rect(0, 0, width, height));
 }
 
-bool RemoteRootWindowHostWin::IsForegroundWindow() {
+bool RemoteWindowTreeHostWin::IsForegroundWindow() {
   return ::GetForegroundWindow() == remote_window_;
 }
 
-Window* RemoteRootWindowHostWin::GetAshWindow() {
+Window* RemoteWindowTreeHostWin::GetAshWindow() {
   return GetRootWindow()->window();
 }
 
-RootWindow* RemoteRootWindowHostWin::GetRootWindow() {
+RootWindow* RemoteWindowTreeHostWin::GetRootWindow() {
   return delegate_->AsRootWindow();
 }
 
-gfx::AcceleratedWidget RemoteRootWindowHostWin::GetAcceleratedWidget() {
+gfx::AcceleratedWidget RemoteWindowTreeHostWin::GetAcceleratedWidget() {
   if (remote_window_)
     return remote_window_;
   // Getting here should only happen for ash_unittests.exe and related code.
   return ::GetDesktopWindow();
 }
 
-void RemoteRootWindowHostWin::Show() {
+void RemoteWindowTreeHostWin::Show() {
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
   if (remote_input_method_private)
     remote_input_method_private->SetRemoteDelegate(this);
 }
 
-void RemoteRootWindowHostWin::Hide() {
+void RemoteWindowTreeHostWin::Hide() {
   NOTIMPLEMENTED();
 }
 
-void RemoteRootWindowHostWin::ToggleFullScreen() {
+void RemoteWindowTreeHostWin::ToggleFullScreen() {
 }
 
-gfx::Rect RemoteRootWindowHostWin::GetBounds() const {
+gfx::Rect RemoteWindowTreeHostWin::GetBounds() const {
   return gfx::Rect(window_size_);
 }
 
-void RemoteRootWindowHostWin::SetBounds(const gfx::Rect& bounds) {
+void RemoteWindowTreeHostWin::SetBounds(const gfx::Rect& bounds) {
   window_size_ = bounds.size();
   NotifyHostResized(bounds.size());
 }
 
-gfx::Insets RemoteRootWindowHostWin::GetInsets() const {
+gfx::Insets RemoteWindowTreeHostWin::GetInsets() const {
   return gfx::Insets();
 }
 
-void RemoteRootWindowHostWin::SetInsets(const gfx::Insets& insets) {
+void RemoteWindowTreeHostWin::SetInsets(const gfx::Insets& insets) {
 }
 
-gfx::Point RemoteRootWindowHostWin::GetLocationOnNativeScreen() const {
+gfx::Point RemoteWindowTreeHostWin::GetLocationOnNativeScreen() const {
   return gfx::Point(0, 0);
 }
 
-void RemoteRootWindowHostWin::SetCursor(gfx::NativeCursor native_cursor) {
+void RemoteWindowTreeHostWin::SetCursor(gfx::NativeCursor native_cursor) {
   if (!host_)
     return;
   host_->Send(
       new MetroViewerHostMsg_SetCursor(uint64(native_cursor.platform())));
 }
 
-void RemoteRootWindowHostWin::SetCapture() {
+void RemoteWindowTreeHostWin::SetCapture() {
 }
 
-void RemoteRootWindowHostWin::ReleaseCapture() {
+void RemoteWindowTreeHostWin::ReleaseCapture() {
 }
 
-bool RemoteRootWindowHostWin::QueryMouseLocation(gfx::Point* location_return) {
+bool RemoteWindowTreeHostWin::QueryMouseLocation(gfx::Point* location_return) {
   aura::client::CursorClient* cursor_client =
       aura::client::GetCursorClient(GetRootWindow()->window());
   if (cursor_client && !cursor_client->IsMouseEventsEnabled()) {
     *location_return = gfx::Point(0, 0);
     return false;
   }
   POINT pt;
   GetCursorPos(&pt);
   *location_return =
       gfx::Point(static_cast<int>(pt.x), static_cast<int>(pt.y));
   return true;
 }
 
-bool RemoteRootWindowHostWin::ConfineCursorToRootWindow() {
+bool RemoteWindowTreeHostWin::ConfineCursorToRootWindow() {
   return true;
 }
 
-void RemoteRootWindowHostWin::UnConfineCursor() {
+void RemoteWindowTreeHostWin::UnConfineCursor() {
 }
 
-void RemoteRootWindowHostWin::OnCursorVisibilityChanged(bool show) {
+void RemoteWindowTreeHostWin::OnCursorVisibilityChanged(bool show) {
   NOTIMPLEMENTED();
 }
 
-void RemoteRootWindowHostWin::MoveCursorTo(const gfx::Point& location) {
+void RemoteWindowTreeHostWin::MoveCursorTo(const gfx::Point& location) {
   VLOG(1) << "In MoveCursorTo: " << location.x() << ", " << location.y();
   if (!host_)
     return;
 
   // This function can be called in cases like when the mouse cursor is
   // restricted within a viewport (For e.g. LockCursor) which assumes that
   // subsequent mouse moves would be received starting with the new cursor
   // coordinates. This is a challenge for Windows ASH for the reasons
   // outlined below.
   // Other cases which don't expect this behavior should continue to work
   // without issues.
 
   // The mouse events are received by the viewer process and sent to the
   // browser. If we invoke the SetCursor API here we continue to receive
   // mouse messages from the viewer which were posted before the SetCursor
   // API executes which messes up the state in the browser. To workaround
   // this we invoke the SetCursor API in the viewer process and ignore
   // mouse messages until we received an ACK from the viewer indicating that
   // the SetCursor operation completed.
   ignore_mouse_moves_until_set_cursor_ack_ = true;
   VLOG(1) << "In MoveCursorTo. Sending IPC";
   host_->Send(new MetroViewerHostMsg_SetCursorPos(location.x(), location.y()));
 }
 
-void RemoteRootWindowHostWin::PostNativeEvent(
+void RemoteWindowTreeHostWin::PostNativeEvent(
     const base::NativeEvent& native_event) {
 }
 
-void RemoteRootWindowHostWin::OnDeviceScaleFactorChanged(
+void RemoteWindowTreeHostWin::OnDeviceScaleFactorChanged(
     float device_scale_factor) {
   NOTIMPLEMENTED();
 }
 
-void RemoteRootWindowHostWin::PrepareForShutdown() {
+void RemoteWindowTreeHostWin::PrepareForShutdown() {
 }
 
-void RemoteRootWindowHostWin::CancelComposition() {
+void RemoteWindowTreeHostWin::CancelComposition() {
   host_->Send(new MetroViewerHostMsg_ImeCancelComposition);
 }
 
-void RemoteRootWindowHostWin::OnTextInputClientUpdated(
+void RemoteWindowTreeHostWin::OnTextInputClientUpdated(
     const std::vector<int32>& input_scopes,
     const std::vector<gfx::Rect>& composition_character_bounds) {
   std::vector<metro_viewer::CharacterBounds> character_bounds;
   for (size_t i = 0; i < composition_character_bounds.size(); ++i) {
     const gfx::Rect& rect = composition_character_bounds[i];
     metro_viewer::CharacterBounds bounds;
     bounds.left = rect.x();
     bounds.top = rect.y();
     bounds.right = rect.right();
     bounds.bottom = rect.bottom();
     character_bounds.push_back(bounds);
   }
   host_->Send(new MetroViewerHostMsg_ImeTextInputClientUpdated(
       input_scopes, character_bounds));
 }
 
 gfx::Point PointFromNativeEvent(int32 x, int32 y) {
   static float scale_factor = gfx::GetModernUIScale();
   gfx::Point result( x * scale_factor, y * scale_factor);
   return result;
 }
 
-void RemoteRootWindowHostWin::OnMouseMoved(int32 x, int32 y, int32 flags) {
+void RemoteWindowTreeHostWin::OnMouseMoved(int32 x, int32 y, int32 flags) {
   if (ignore_mouse_moves_until_set_cursor_ack_)
     return;
 
   gfx::Point location = PointFromNativeEvent(x, y);
   ui::MouseEvent event(ui::ET_MOUSE_MOVED, location, location, flags, 0);
   delegate_->OnHostMouseEvent(&event);
 }
 
-void RemoteRootWindowHostWin::OnMouseButton(
+void RemoteWindowTreeHostWin::OnMouseButton(
     const MetroViewerHostMsg_MouseButtonParams& params) {
   gfx::Point location = PointFromNativeEvent(params.x, params.y);
   ui::MouseEvent mouse_event(params.event_type, location, location,
                              static_cast<int>(params.flags),
                              static_cast<int>(params.changed_button));
 
   SetEventFlags(params.flags | key_event_flags());
   if (params.event_type == ui::ET_MOUSEWHEEL) {
     ui::MouseWheelEvent wheel_event(mouse_event, 0, params.extra);
     delegate_->OnHostMouseEvent(&wheel_event);
@@ skipping 11 matching lines @@
     } else {
       mouse_event.SetClickCount(1);
     }
     last_mouse_click_event_ .reset(new ui::MouseEvent(mouse_event));
     delegate_->OnHostMouseEvent(&mouse_event);
   } else {
     delegate_->OnHostMouseEvent(&mouse_event);
   }
 }
 
-void RemoteRootWindowHostWin::OnKeyDown(uint32 vkey,
+void RemoteWindowTreeHostWin::OnKeyDown(uint32 vkey,
                                         uint32 repeat_count,
                                         uint32 scan_code,
                                         uint32 flags) {
   DispatchKeyboardMessage(ui::ET_KEY_PRESSED, vkey, repeat_count, scan_code,
                           flags, false);
 }
 
-void RemoteRootWindowHostWin::OnKeyUp(uint32 vkey,
+void RemoteWindowTreeHostWin::OnKeyUp(uint32 vkey,
                                       uint32 repeat_count,
                                       uint32 scan_code,
                                       uint32 flags) {
   DispatchKeyboardMessage(ui::ET_KEY_RELEASED, vkey, repeat_count, scan_code,
                           flags, false);
 }
 
-void RemoteRootWindowHostWin::OnChar(uint32 key_code,
+void RemoteWindowTreeHostWin::OnChar(uint32 key_code,
                                      uint32 repeat_count,
                                      uint32 scan_code,
                                      uint32 flags) {
   DispatchKeyboardMessage(ui::ET_KEY_PRESSED, key_code, repeat_count,
                           scan_code, flags, true);
 }
 
-void RemoteRootWindowHostWin::OnWindowActivated() {
+void RemoteWindowTreeHostWin::OnWindowActivated() {
   delegate_->OnHostActivated();
 }
 
-void RemoteRootWindowHostWin::OnTouchDown(int32 x,
+void RemoteWindowTreeHostWin::OnTouchDown(int32 x,
                                           int32 y,
                                           uint64 timestamp,
                                           uint32 pointer_id) {
   gfx::Point location = PointFromNativeEvent(x, y);
   ui::TouchEvent event(ui::ET_TOUCH_PRESSED,
                        location,
                        pointer_id,
                        base::TimeDelta::FromMicroseconds(timestamp));
   delegate_->OnHostTouchEvent(&event);
 }
 
-void RemoteRootWindowHostWin::OnTouchUp(int32 x,
+void RemoteWindowTreeHostWin::OnTouchUp(int32 x,
                                         int32 y,
                                         uint64 timestamp,
                                         uint32 pointer_id) {
   gfx::Point location = PointFromNativeEvent(x, y);
   ui::TouchEvent event(ui::ET_TOUCH_RELEASED,
                        location,
                        pointer_id,
                        base::TimeDelta::FromMicroseconds(timestamp));
   delegate_->OnHostTouchEvent(&event);
 }
 
-void RemoteRootWindowHostWin::OnTouchMoved(int32 x,
+void RemoteWindowTreeHostWin::OnTouchMoved(int32 x,
                                            int32 y,
                                            uint64 timestamp,
                                            uint32 pointer_id) {
   gfx::Point location = PointFromNativeEvent(x, y);
   ui::TouchEvent event(ui::ET_TOUCH_MOVED,
                        location,
                        pointer_id,
                        base::TimeDelta::FromMicroseconds(timestamp));
   delegate_->OnHostTouchEvent(&event);
 }
 
-void RemoteRootWindowHostWin::OnFileSaveAsDone(bool success,
+void RemoteWindowTreeHostWin::OnFileSaveAsDone(bool success,
                                                const base::FilePath& filename,
                                                int filter_index) {
   if (success)
     file_saveas_completion_callback_.Run(filename, filter_index, NULL);
   else
     failure_callback_.Run(NULL);
   file_saveas_completion_callback_.Reset();
   failure_callback_.Reset();
 }
 
 
-void RemoteRootWindowHostWin::OnFileOpenDone(bool success,
+void RemoteWindowTreeHostWin::OnFileOpenDone(bool success,
                                              const base::FilePath& filename) {
   if (success)
     file_open_completion_callback_.Run(base::FilePath(filename), 0, NULL);
   else
     failure_callback_.Run(NULL);
   file_open_completion_callback_.Reset();
   failure_callback_.Reset();
 }
 
-void RemoteRootWindowHostWin::OnMultiFileOpenDone(
+void RemoteWindowTreeHostWin::OnMultiFileOpenDone(
     bool success,
     const std::vector<base::FilePath>& files) {
   if (success)
     multi_file_open_completion_callback_.Run(files, NULL);
   else
     failure_callback_.Run(NULL);
   multi_file_open_completion_callback_.Reset();
   failure_callback_.Reset();
 }
 
-void RemoteRootWindowHostWin::OnSelectFolderDone(
+void RemoteWindowTreeHostWin::OnSelectFolderDone(
     bool success,
     const base::FilePath& folder) {
   if (success)
     select_folder_completion_callback_.Run(base::FilePath(folder), 0, NULL);
   else
     failure_callback_.Run(NULL);
   select_folder_completion_callback_.Reset();
   failure_callback_.Reset();
 }
 
-void RemoteRootWindowHostWin::OnSetCursorPosAck() {
+void RemoteWindowTreeHostWin::OnSetCursorPosAck() {
   DCHECK(ignore_mouse_moves_until_set_cursor_ack_);
   ignore_mouse_moves_until_set_cursor_ack_ = false;
 }
 
 ui::RemoteInputMethodPrivateWin*
-RemoteRootWindowHostWin::GetRemoteInputMethodPrivate() {
+RemoteWindowTreeHostWin::GetRemoteInputMethodPrivate() {
   ui::InputMethod* input_method = GetAshWindow()->GetProperty(
       aura::client::kRootWindowInputMethodKey);
   return ui::RemoteInputMethodPrivateWin::Get(input_method);
 }
 
-void RemoteRootWindowHostWin::OnImeCandidatePopupChanged(bool visible) {
+void RemoteWindowTreeHostWin::OnImeCandidatePopupChanged(bool visible) {
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
   if (!remote_input_method_private)
     return;
   remote_input_method_private->OnCandidatePopupChanged(visible);
 }
 
-void RemoteRootWindowHostWin::OnImeCompositionChanged(
+void RemoteWindowTreeHostWin::OnImeCompositionChanged(
     const base::string16& text,
     int32 selection_start,
     int32 selection_end,
     const std::vector<metro_viewer::UnderlineInfo>& underlines) {
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
   if (!remote_input_method_private)
     return;
   ui::CompositionText composition_text;
   FillCompositionText(
       text, selection_start, selection_end, underlines, &composition_text);
   remote_input_method_private->OnCompositionChanged(composition_text);
 }
 
-void RemoteRootWindowHostWin::OnImeTextCommitted(const base::string16& text) {
+void RemoteWindowTreeHostWin::OnImeTextCommitted(const base::string16& text) {
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
   if (!remote_input_method_private)
     return;
   remote_input_method_private->OnTextCommitted(text);
 }
 
-void RemoteRootWindowHostWin::OnImeInputSourceChanged(uint16 language_id,
+void RemoteWindowTreeHostWin::OnImeInputSourceChanged(uint16 language_id,
                                                       bool is_ime) {
   ui::RemoteInputMethodPrivateWin* remote_input_method_private =
       GetRemoteInputMethodPrivate();
   if (!remote_input_method_private)
     return;
   remote_input_method_private->OnInputSourceChanged(language_id, is_ime);
 }
 
-void RemoteRootWindowHostWin::DispatchKeyboardMessage(ui::EventType type,
+void RemoteWindowTreeHostWin::DispatchKeyboardMessage(ui::EventType type,
                                                       uint32 vkey,
                                                       uint32 repeat_count,
                                                       uint32 scan_code,
                                                       uint32 flags,
                                                       bool is_character) {
   SetEventFlags(flags | mouse_event_flags());
   if (base::MessageLoop::current()->IsNested()) {
     int index = (flags & ui::EF_ALT_DOWN) ? 1 : 0;
     const int char_message[] = {WM_CHAR, WM_SYSCHAR};
     const int keydown_message[] = {WM_KEYDOWN, WM_SYSKEYDOWN};
     const int keyup_message[] = {WM_KEYUP, WM_SYSKEYUP};
     uint32 message = is_character
                          ? char_message[index]
                          : (type == ui::ET_KEY_PRESSED ? keydown_message[index]
                                                        : keyup_message[index]);
     ::PostThreadMessage(::GetCurrentThreadId(),
                         message,
                         vkey,
                         repeat_count | scan_code >> 15);
   } else {
     ui::KeyEvent event(type,
                        ui::KeyboardCodeForWindowsKeyCode(vkey),
                        flags,
                        is_character);
     delegate_->OnHostKeyEvent(&event);
   }
 }
 
-void RemoteRootWindowHostWin::SetEventFlags(uint32 flags) {
+void RemoteWindowTreeHostWin::SetEventFlags(uint32 flags) {
   if (flags == event_flags_)
     return;
   event_flags_ = flags;
   SetVirtualKeyStates(event_flags_);
 }
 
 }  // namespace aura