Rename Desktop->RootWindow.

ui/views/widget/tooltip_manager_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 "base/logging.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/tooltip_client.h"
-#include "ui/aura/desktop.h"
+#include "ui/aura/root_window.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/font.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/native_widget_aura.h"
 #include "ui/views/widget/tooltip_manager_aura.h"
 
 namespace views {
 
 // static
@@ skipping 24 matching lines @@
 
 TooltipManagerAura::~TooltipManagerAura() {
   native_widget_aura_->GetNativeView()->SetProperty(aura::kTooltipTextKey,
       NULL);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TooltipManagerAura, TooltipManager implementation:
 
 void TooltipManagerAura::UpdateTooltip() {
-  void* property = aura::Desktop::GetInstance()->GetProperty(
-      aura::kDesktopTooltipClientKey);
+  void* property = aura::RootWindow::GetInstance()->GetProperty(
+      aura::kRootWindowTooltipClientKey);
   if (property) {
-    gfx::Point view_point = aura::Desktop::GetInstance()->last_mouse_location();
-    aura::Window::ConvertPointToWindow(aura::Desktop::GetInstance(),
+    gfx::Point view_point =
+        aura::RootWindow::GetInstance()->last_mouse_location();
+    aura::Window::ConvertPointToWindow(aura::RootWindow::GetInstance(),
         native_widget_aura_->GetNativeView(), &view_point);
     View* view = GetViewUnderPoint(view_point);
     if (view) {
       View::ConvertPointFromWidget(view, &view_point);
       if (!view->GetTooltipText(view_point, &tooltip_text_))
           tooltip_text_.clear();
     } else {
       tooltip_text_.clear();
     }
     aura::TooltipClient* tc = static_cast<aura::TooltipClient*>(property);
     tc->UpdateTooltip(native_widget_aura_->GetNativeView());
   }
 }
 
 void TooltipManagerAura::TooltipTextChanged(View* view)  {
-  void* property = aura::Desktop::GetInstance()->GetProperty(
-      aura::kDesktopTooltipClientKey);
+  void* property = aura::RootWindow::GetInstance()->GetProperty(
+      aura::kRootWindowTooltipClientKey);
   if (property) {
-    gfx::Point view_point = aura::Desktop::GetInstance()->last_mouse_location();
-    aura::Window::ConvertPointToWindow(aura::Desktop::GetInstance(),
+    gfx::Point view_point =
+        aura::RootWindow::GetInstance()->last_mouse_location();
+    aura::Window::ConvertPointToWindow(aura::RootWindow::GetInstance(),
         native_widget_aura_->GetNativeView(), &view_point);
     View* target = GetViewUnderPoint(view_point);
     if (target != view)
       return;
     if (target) {
       View::ConvertPointFromWidget(view, &view_point);
       if (!view->GetTooltipText(view_point, &tooltip_text_))
           tooltip_text_.clear();
     } else {
       tooltip_text_.clear();
@@ skipping 10 matching lines @@
 void TooltipManagerAura::HideKeyboardTooltip()  {
   NOTREACHED();
 }
 
 View* TooltipManagerAura::GetViewUnderPoint(const gfx::Point& point) {
   View* root_view = native_widget_aura_->GetWidget()->GetRootView();
   return root_view->GetEventHandlerForPoint(point);
 }
 
 }  // namespace views.