Rename Desktop->RootWindow.

ui/aura/window.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_AURA_WINDOW_H_
 #define UI_AURA_WINDOW_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 14 matching lines @@
 
 class SkCanvas;
 
 namespace ui {
 class Layer;
 class Transform;
 }
 
 namespace aura {
 
-class Desktop;
 class EventFilter;
 class LayoutManager;
+class RootWindow;
 class WindowDelegate;
 class WindowObserver;
 
 namespace internal {
 class FocusManager;
 }
 
 // Aura window implementation. Interesting events are sent to the
 // WindowDelegate.
 // TODO(beng): resolve ownership.
@@ skipping 70 matching lines @@
   // not animating, it simply returns the current bounds.
   gfx::Rect GetTargetBounds() const;
 
   // Marks the a portion of window as needing to be painted.
   void SchedulePaintInRect(const gfx::Rect& rect);
 
   // Sets the contents of the window.
   void SetCanvas(const SkCanvas& canvas, const gfx::Point& origin);
 
   // Sets the parent window of the window. If NULL, the window is parented to
-  // the desktop's window.
+  // the root window.
   void SetParent(Window* parent);
 
   // Stacks the specified child of this Window at the front of the z-order.
   void StackChildAtTop(Window* child);
 
   // Stacks |child| above |other|.  Does nothing if |child| is already above
   // |other|.
   void StackChildAbove(Window* child, Window* other);
 
   // Returns true if this window can be activated.
@@ skipping 115 matching lines @@
 
   // Returns the window property for given |name|.  Returns NULL or 0 if
   // the property does not exist.
   // TODO(oshima): Returning 0 for non existing property is problematic.
   // Fix ViewProp to be able to tell if the property exists and
   // change it to -1.
   void* GetProperty(const char* name) const;
   int GetIntProperty(const char* name) const;
 
  protected:
-  // Returns the desktop or NULL if we aren't yet attached to a desktop.
-  virtual Desktop* GetDesktop();
+  // Returns the root window or NULL if we aren't yet attached to the root
+  // window.
+  virtual RootWindow* GetRootWindow();
 
-  // Called when the |window| is detached from the desktop by being
-  // removed from its parent.
-  virtual void WindowDetachedFromDesktop(aura::Window* window);
+  // Called when the |window| is detached from the root window by being removed
+  // from its parent.
+  virtual void WindowDetachedFromRootWindow(aura::Window* window);
 
  private:
   friend class LayoutManager;
 
   // Changes the bounds of the window without condition.
   void SetBoundsInternal(const gfx::Rect& new_bounds);
 
   // Updates the visible state of the layer, but does not make visible-state
   // specific changes. Called from Show()/Hide().
   void SetVisible(bool visible);
@@ skipping 69 matching lines @@
   // TODO(oshima): Consolidcate ViewProp and aura::window property
   // implementation.
   std::map<const char*, void*> prop_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_WINDOW_H_