Move ash specific cursor code to CursorManager.

ui/aura/root_window.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/root_window.h"
 
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "ui/aura/aura_switches.h"
 #include "ui/aura/client/activation_client.h"
 #include "ui/aura/client/capture_client.h"
-#include "ui/aura/client/drag_drop_client.h"
+#include "ui/aura/client/cursor_client.h"
 #include "ui/aura/client/event_client.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/display_manager.h"
 #include "ui/aura/env.h"
 #include "ui/aura/event_filter.h"
 #include "ui/aura/focus_manager.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_delegate.h"
@@ skipping 74 matching lines @@
   CancelLock();
 }
 
 void CompositorLock::CancelLock() {
   if (!root_window_)
     return;
   root_window_->UnlockCompositor();
   root_window_ = NULL;
 }
 
-bool RootWindow::hide_host_cursor_ = false;
-
 RootWindow::CreateParams::CreateParams(const gfx::Rect& a_initial_bounds)
     : initial_bounds(a_initial_bounds),
       host(NULL) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, public:
 
 RootWindow::RootWindow(const CreateParams& params)
     : Window(NULL),
@@ skipping 108 matching lines @@
     SetLastMouseLocation(this, ui::ConvertPointToDIP(layer(), point));
 
   synthesize_mouse_move_ = false;
 }
 
 gfx::Point RootWindow::GetHostOrigin() const {
   return host_->GetBounds().origin();
 }
 
 void RootWindow::SetCursor(gfx::NativeCursor cursor) {
-  // If a drag is in progress, the DragDropClient should override the cursor.
-  client::DragDropClient* dnd_client = client::GetDragDropClient(this);
-  if (dnd_client && dnd_client->IsDragDropInProgress())
-    cursor = dnd_client->GetDragCursor();
-
   last_cursor_ = cursor;
   // A lot of code seems to depend on NULL cursors actually showing an arrow,
   // so just pass everything along to the host.
   host_->SetCursor(cursor);
 }
 
 void RootWindow::ShowCursor(bool show) {
   // Send entered / exited so that visual state can be updated to match
   // cursor state.
   if (show != cursor_shown_) {
@@ skipping 258 matching lines @@
 }
 
 void RootWindow::OnCompositingAborted(ui::Compositor*) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, ui::LayerDelegate implementation:
 
 void RootWindow::OnDeviceScaleFactorChanged(
     float device_scale_factor) {
-  if (cursor_shown_)
+  const bool cursor_is_in_bounds =
+      GetBoundsInScreen().Contains(Env::GetInstance()->last_mouse_location());
+  if (cursor_is_in_bounds && cursor_shown_)
     ShowCursor(false);
   host_->OnDeviceScaleFactorChanged(device_scale_factor);
   Window::OnDeviceScaleFactorChanged(device_scale_factor);
-  if (cursor_shown_)
+  // Update the device scale factor of the cursor client only when the last
+  // mouse location is on this root window.
+  if (cursor_is_in_bounds) {
+    client::CursorClient* cursor_client = client::GetCursorClient(this);
+    if (cursor_client)
+      cursor_client->SetDeviceScaleFactor(device_scale_factor);
+  }
+  if (cursor_is_in_bounds && cursor_shown_)
     ShowCursor(true);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RootWindow, overridden from aura::Window:
 
 bool RootWindow::CanFocus() const {
   return IsVisible();
 }
 
@@ skipping 546 matching lines @@
 void RootWindow::UnlockCompositor() {
   DCHECK(compositor_lock_);
   compositor_lock_ = NULL;
   if (draw_on_compositor_unlock_) {
     draw_on_compositor_unlock_ = false;
     ScheduleDraw();
   }
 }
 
 }  // namespace aura