Move ash specific cursor code to CursorManager.

ash/drag_drop/drag_drop_controller.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 "ash/drag_drop/drag_drop_controller.h"
 
 #include "ash/drag_drop/drag_drop_tracker.h"
 #include "ash/drag_drop/drag_image_view.h"
 #include "ash/shell.h"
 #include "ash/wm/coordinate_conversion.h"
@@ skipping 44 matching lines @@
   if (drag_image_.get())
     drag_image_.reset();
 }
 
 int DragDropController::StartDragAndDrop(const ui::OSExchangeData& data,
                                          aura::RootWindow* root_window,
                                          const gfx::Point& root_location,
                                          int operation) {
   DCHECK(!IsDragDropInProgress());
 
-  drag_cursor_ = ui::kCursorPointer;
   drag_drop_tracker_.reset(new DragDropTracker(root_window));
 
   drag_data_ = &data;
   drag_operation_ = operation;
   const ui::OSExchangeDataProviderAura& provider =
       static_cast<const ui::OSExchangeDataProviderAura&>(data.provider());
 
   drag_image_.reset(new DragImageView);
   drag_image_->SetImage(provider.drag_image());
   drag_image_offset_ = provider.drag_image_offset();
@@ skipping 45 matching lines @@
                             drag_operation_);
       e.set_flags(event.flags());
       int op = delegate->OnDragUpdated(e);
       gfx::NativeCursor cursor = ui::kCursorNoDrop;
       if (op & ui::DragDropTypes::DRAG_COPY)
         cursor = ui::kCursorCopy;
       else if (op & ui::DragDropTypes::DRAG_LINK)
         cursor = ui::kCursorAlias;
       else if (op & ui::DragDropTypes::DRAG_MOVE)
         cursor = ui::kCursorMove;
-      drag_cursor_ = cursor;
       ash::Shell::GetInstance()->cursor_manager()->SetCursor(cursor);
     }
   }
 
   DCHECK(drag_image_.get());
   if (drag_image_->visible()) {
     gfx::Point root_location_in_screen = event.root_location();
     ash::wm::ConvertPointToScreen(target->GetRootWindow(),
                                   &root_location_in_screen);
     drag_image_->SetScreenPosition(
         root_location_in_screen.Subtract(drag_image_offset_));
   }
 }
 
 void DragDropController::Drop(aura::Window* target,
                               const ui::LocatedEvent& event) {
-  drag_cursor_ = ui::kCursorPointer;
   ash::Shell::GetInstance()->cursor_manager()->SetCursor(ui::kCursorPointer);
   aura::client::DragDropDelegate* delegate = NULL;
 
   // We must guarantee that a target gets a OnDragEntered before Drop. WebKit
   // depends on not getting a Drop without DragEnter. This behavior is
   // consistent with drag/drop on other platforms.
   if (target != drag_window_)
     DragUpdate(target, event);
   DCHECK(target == drag_window_);
 
   if ((delegate = aura::client::GetDragDropDelegate(target))) {
     ui::DropTargetEvent e(
         *drag_data_, event.location(), event.root_location(), drag_operation_);
     e.set_flags(event.flags());
     drag_operation_ = delegate->OnPerformDrop(e);
     if (drag_operation_ == 0)
       StartCanceledAnimation();
     else
       drag_image_.reset();
   } else {
     drag_image_.reset();
   }
 
   Cleanup();
   if (should_block_during_drag_drop_)
     quit_closure_.Run();
 }
 
 void DragDropController::DragCancel() {
-  drag_cursor_ = ui::kCursorPointer;
   ash::Shell::GetInstance()->cursor_manager()->SetCursor(ui::kCursorPointer);
 
   // |drag_window_| can be NULL if we have just started the drag and have not
   // received any DragUpdates, or, if the |drag_window_| gets destroyed during
   // a drag/drop.
   aura::client::DragDropDelegate* delegate = drag_window_?
       aura::client::GetDragDropDelegate(drag_window_) : NULL;
   if (delegate)
     delegate->OnDragExited();
 
   Cleanup();
   drag_operation_ = 0;
   StartCanceledAnimation();
   if (should_block_during_drag_drop_)
     quit_closure_.Run();
 }
 
 bool DragDropController::IsDragDropInProgress() {
   return !!drag_drop_tracker_.get();
 }
 
-gfx::NativeCursor DragDropController::GetDragCursor() {
-  return drag_cursor_;
-}
-
 bool DragDropController::PreHandleKeyEvent(aura::Window* target,
                                            ui::KeyEvent* event) {
   if (IsDragDropInProgress() && event->key_code() == ui::VKEY_ESCAPE) {
     DragCancel();
     return true;
   }
   return false;
 }
 
 bool DragDropController::PreHandleMouseEvent(aura::Window* target,
@@ skipping 92 matching lines @@
     drag_window_->RemoveObserver(this);
   drag_window_ = NULL;
   drag_data_ = NULL;
   // Cleanup can be called again while deleting DragDropTracker, so use Pass
   // instead of reset to avoid double free.
   drag_drop_tracker_.Pass();
 }
 
 }  // namespace internal
 }  // namespace ash