aura-x11: Add custom web cursor support.

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_image_view.h"
 #include "ash/shell.h"
 #include "base/message_loop.h"
 #include "ui/aura/client/drag_drop_delegate.h"
@@ skipping 96 matching lines @@
       delegate->OnDragEntered(e);
     }
   } else {
     if ((delegate = aura::client::GetDragDropDelegate(drag_window_))) {
       aura::DropTargetEvent e(*drag_data_,
                               event.location(),
                               event.root_location(),
                               drag_operation_);
       int op = delegate->OnDragUpdated(e);
        gfx::NativeCursor cursor = (op == ui::DragDropTypes::DRAG_NONE)?
-           aura::kCursorMove : aura::kCursorHand;
+           ui::kCursorMove : ui::kCursorHand;
        Shell::GetRootWindow()->SetCursor(cursor);
     }
   }
 
   DCHECK(drag_image_.get());
   if (drag_image_->visible()) {
     drag_image_->SetScreenPosition(
         event.root_location().Add(kDragDropWidgetOffset));
   }
 }
 
 void DragDropController::Drop(aura::Window* target,
                               const aura::LocatedEvent& event) {
-  Shell::GetRootWindow()->SetCursor(aura::kCursorPointer);
+  Shell::GetRootWindow()->SetCursor(ui::kCursorPointer);
   aura::client::DragDropDelegate* delegate = NULL;
 
   // |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. Otherwise, target should be equal to the |drag_window_|.
   DCHECK(target == drag_window_ || !drag_window_);
   if ((delegate = aura::client::GetDragDropDelegate(target))) {
     aura::DropTargetEvent e(
         *drag_data_, event.location(), event.root_location(), drag_operation_);
     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_)
     MessageLoop::current()->Quit();
 }
 
 void DragDropController::DragCancel() {
-  Shell::GetRootWindow()->SetCursor(aura::kCursorPointer);
+  Shell::GetRootWindow()->SetCursor(ui::kCursorPointer);
   aura::client::DragDropDelegate* delegate = NULL;
   if ((delegate = aura::client::GetDragDropDelegate(drag_window_))) {
     delegate->OnDragExited();
   }
   Cleanup();
   drag_operation_ = 0;
   StartCanceledAnimation();
   if (should_block_during_drag_drop_)
     MessageLoop::current()->Quit();
 }
@@ skipping 92 matching lines @@
 void DragDropController::Cleanup() {
   if (drag_window_)
     drag_window_->RemoveObserver(this);
   drag_window_ = NULL;
   drag_data_ = NULL;
   drag_drop_in_progress_ = false;
 }
 
 }  // namespace internal
 }  // namespace ash