Rename Desktop->RootWindow.

ui/views/widget/native_widget_aura.cc

 // 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.
 
 #include "ui/views/widget/native_widget_aura.h"
 
 #include "base/bind.h"
 #include "base/string_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/shadow_types.h"
-#include "ui/aura/desktop.h"
-#include "ui/aura/desktop_observer.h"
 #include "ui/aura/event.h"
+#include "ui/aura/root_window.h"
+#include "ui/aura/root_window_observer.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/drop_helper.h"
 #include "ui/views/widget/native_widget_delegate.h"
@@ skipping 32 matching lines @@
     default:
       NOTREACHED() << "Unhandled widget type " << type;
       return aura::WINDOW_TYPE_UNKNOWN;
   }
 }
 
 }  // namespace
 
 // Used when SetInactiveRenderingDisabled() is invoked to track when active
 // status changes in such a way that we should enable inactive rendering.
-class NativeWidgetAura::DesktopObserverImpl : public aura::DesktopObserver {
+class NativeWidgetAura::RootWindowObserverImpl
+    : public aura::RootWindowObserver {
  public:
-  explicit DesktopObserverImpl(NativeWidgetAura* host)
+  explicit RootWindowObserverImpl(NativeWidgetAura* host)
       : host_(host) {
-    aura::Desktop::GetInstance()->AddObserver(this);
+    aura::RootWindow::GetInstance()->AddObserver(this);
   }
 
-  virtual ~DesktopObserverImpl() {
-    aura::Desktop::GetInstance()->RemoveObserver(this);
+  virtual ~RootWindowObserverImpl() {
+    aura::RootWindow::GetInstance()->RemoveObserver(this);
   }
 
-  // DesktopObserver overrides:
+  // RootWindowObserver overrides:
   virtual void OnActiveWindowChanged(aura::Window* active) OVERRIDE {
     if (!active || (active != host_->window_ &&
                     active->transient_parent() != host_->window_)) {
       host_->delegate_->EnableInactiveRendering();
     }
   }
 
  private:
   NativeWidgetAura* host_;
 
-  DISALLOW_COPY_AND_ASSIGN(DesktopObserverImpl);
+  DISALLOW_COPY_AND_ASSIGN(RootWindowObserverImpl);
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, public:
 
 NativeWidgetAura::NativeWidgetAura(internal::NativeWidgetDelegate* delegate)
     : delegate_(delegate),
       ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
       ownership_(Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET),
       ALLOW_THIS_IN_INITIALIZER_LIST(close_widget_factory_(this)),
@@ skipping 321 matching lines @@
 
 void NativeWidgetAura::Activate() {
   window_->Activate();
 }
 
 void NativeWidgetAura::Deactivate() {
   window_->Deactivate();
 }
 
 bool NativeWidgetAura::IsActive() const {
-  return aura::Desktop::GetInstance()->active_window() == window_;
+  return aura::RootWindow::GetInstance()->active_window() == window_;
 }
 
 void NativeWidgetAura::SetAlwaysOnTop(bool on_top) {
   window_->SetIntProperty(aura::kAlwaysOnTopKey, on_top);
 }
 
 void NativeWidgetAura::Maximize() {
   window_->SetIntProperty(aura::kShowStateKey, ui::SHOW_STATE_MAXIMIZED);
 }
 
@@ skipping 38 matching lines @@
 bool NativeWidgetAura::IsAccessibleWidget() const {
   // http://crbug.com/102570
   //NOTIMPLEMENTED();
   return false;
 }
 
 void NativeWidgetAura::RunShellDrag(View* view,
                                    const ui::OSExchangeData& data,
                                    int operation) {
   aura::DragDropClient* client = static_cast<aura::DragDropClient*>(
-      aura::Desktop::GetInstance()->GetProperty(
-          aura::kDesktopDragDropClientKey));
+      aura::RootWindow::GetInstance()->GetProperty(
+          aura::kRootWindowDragDropClientKey));
   if (client)
     client->StartDragAndDrop(data, operation);
 }
 
 void NativeWidgetAura::SchedulePaintInRect(const gfx::Rect& rect) {
   if (window_)
     window_->SchedulePaintInRect(rect);
 }
 
 void NativeWidgetAura::SetCursor(gfx::NativeCursor cursor) {
   cursor_ = cursor;
-  aura::Desktop::GetInstance()->SetCursor(cursor);
+  aura::RootWindow::GetInstance()->SetCursor(cursor);
 }
 
 void NativeWidgetAura::ClearNativeFocus() {
   if (window_ && window_->GetFocusManager())
     window_->GetFocusManager()->SetFocusedWindow(window_);
 }
 
 void NativeWidgetAura::FocusNativeView(gfx::NativeView native_view) {
   window_->GetFocusManager()->SetFocusedWindow(native_view);
 }
 
 gfx::Rect NativeWidgetAura::GetWorkAreaBoundsInScreen() const {
   return gfx::Screen::GetMonitorWorkAreaNearestWindow(GetNativeView());
 }
 
 void NativeWidgetAura::SetInactiveRenderingDisabled(bool value) {
   if (!value)
-    desktop_observer_.reset();
+    root_window_observer_.reset();
   else
-    desktop_observer_.reset(new DesktopObserverImpl(this));
+    root_window_observer_.reset(new RootWindowObserverImpl(this));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetAura, views::InputMethodDelegate implementation:
 
 void NativeWidgetAura::DispatchKeyEventPostIME(const KeyEvent& key) {
   if (delegate_->OnKeyEvent(key))
     return;
   if (key.type() == ui::ET_KEY_PRESSED && GetWidget()->GetFocusManager())
     GetWidget()->GetFocusManager()->OnKeyEvent(key);
@@ skipping 250 matching lines @@
 
   // And now, notify them that they have a brand new parent.
   for (Widget::Widgets::iterator it = widgets.begin();
       it != widgets.end(); ++it) {
     (*it)->NotifyNativeViewHierarchyChanged(true, new_parent);
   }
 }
 
 // static
 bool NativeWidgetPrivate::IsMouseButtonDown() {
-  return aura::Desktop::GetInstance()->IsMouseButtonDown();
+  return aura::RootWindow::GetInstance()->IsMouseButtonDown();
 }
 
 }  // namespace internal
 }  // namespace views