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;
+  SetDragCursor(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);
+      SetDragCursor(cursor);
+      ash::Shell::GetInstance()->cursor_manager()->SetCursor(drag_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;
+  SetDragCursor(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);
+  SetDragCursor(ui::kCursorPointer);

[Daniel Erat, 2012/09/06 23:47:15]

Can SetDragCursor() just call
ash::Shell::GetInstance()->cursor_manager()->SetCursor()?  The only place where
you don't appear to call SetCursor() immediately after SetDragCursor() is
StartDragAndDrop() -- would it be safe to do it there too?

[mazda, 2012/09/07 02:20:57]

It turned out that we don't need to set drag_cursor_ in the first place. It's
used only for overriding the cursor in RootWindow::SetCursor, but
DragDropController sets the cursor while dragging, so it's unnecessary to
override the cursor unless SetCursor is called from another place. Currently
CompoundEventFilter calls SetCursor while dragging and resets the dragging
cursor, so I made CompoundEventFilter not to set cursor while dragging.
By doing this, we can remove DragDropController::SetDragCursor,
DragDropClient::GetDragCursor and simplify the code of CursorManager.

+  ash::Shell::GetInstance()->cursor_manager()->SetCursor(drag_cursor_);
 
   // |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();
@@ skipping 114 matching lines @@
 void DragDropController::Cleanup() {
   if (drag_window_)
     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();
 }
 
+void DragDropController::SetDragCursor(gfx::NativeCursor cursor) {
+  drag_cursor_ = ash::Shell::GetInstance()->cursor_manager()->
+      GetCursorFromNativeType(cursor);
+}
+
 }  // namespace internal
 }  // namespace ash