Rename Desktop->RootWindow.

ui/aura/root_window_host.h

Index: ui/aura/root_window_host.h
===================================================================
--- ui/aura/root_window_host.h	(revision 113260)
+++ ui/aura/root_window_host.h	(working copy)
@@ -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_DESKTOP_HOST_H_
-#define UI_AURA_DESKTOP_HOST_H_
+#ifndef UI_AURA_ROOT_WINDOW_HOST_H_
+#define UI_AURA_ROOT_WINDOW_HOST_H_
 #pragma once
 
 #include "base/message_loop.h"
@@ -18,39 +18,40 @@
 
 namespace aura {
 
-class Desktop;
+class RootWindow;
 
-// DesktopHost bridges between a native window and the embedded Desktop. It
-// provides the accelerated widget and maps events from the native os to aura.
-class DesktopHost : public MessageLoop::Dispatcher {
+// RootWindowHost bridges between a native window and the embedded RootWindow.
+// It provides the accelerated widget and maps events from the native os to
+// aura.
+class RootWindowHost : public MessageLoop::Dispatcher {
  public:
-  virtual ~DesktopHost() {}
+  virtual ~RootWindowHost() {}
 
-  // Creates a new DesktopHost. The caller owns the returned value.
-  static DesktopHost* Create(const gfx::Rect& bounds);
+  // Creates a new RootWindowHost. The caller owns the returned value.
+  static RootWindowHost* Create(const gfx::Rect& bounds);
 
   // Returns the actual size of the screen.
   // (gfx::Screen only reports on the virtual desktop exposed by Aura.)
   static gfx::Size GetNativeScreenSize();
 
-  // Sets the Desktop this DesktopHost is hosting. DesktopHost does not own the
-  // Desktop.
-  virtual void SetDesktop(Desktop* desktop) = 0;
+  // Sets the RootWindow this RootWindowHost is hosting. RootWindowHost does not
+  // own the RootWindow.
+  virtual void SetRootWindow(RootWindow* root_window) = 0;
 
   // Returns the accelerated widget.
   virtual gfx::AcceleratedWidget GetAcceleratedWidget() = 0;
 
-  // Shows the DesktopHost.
+  // Shows the RootWindowHost.
   virtual void Show() = 0;
 
   // Toggles the host's full screen state.
   virtual void ToggleFullScreen() = 0;
 
-  // Gets/Sets the size of the DesktopHost.
+  // Gets/Sets the size of the RootWindowHost.
   virtual gfx::Size GetSize() const = 0;
   virtual void SetSize(const gfx::Size& size) = 0;
 
-  // Returns the location of the desktop on native screen.
+  // Returns the location of the RootWindow on native screen.
   virtual gfx::Point GetLocationOnNativeScreen() const = 0;
 
   // Sets the currently displayed cursor.
@@ -58,7 +59,7 @@
 
   // Queries the mouse's current position relative to the host window.
   // The position is constrained within the host window.
-  // You should probably call Desktop::last_mouse_location() instead; this
+  // You should probably call RootWindow::last_mouse_location() instead; this
   // method can be expensive.
   virtual gfx::Point QueryMouseLocation() = 0;
 
@@ -68,4 +69,4 @@
 
 }  // namespace aura
 
-#endif  // UI_AURA_DESKTOP_HOST_H_
+#endif  // UI_AURA_ROOT_WINDOW_HOST_H_