aura: Fix a couple of drag drop issues:

ash/drag_drop/drag_drop_controller.h

 // 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.
 
 #ifndef ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
 #define ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_
 
 #include "ash/ash_export.h"
 #include "base/callback.h"
 #include "ui/aura/client/drag_drop_client.h"
@@ skipping 39 matching lines @@
   // Overridden from aura::client::DragDropClient:
   virtual int StartDragAndDrop(const ui::OSExchangeData& data,
                                const gfx::Point& root_location,
                                int operation) OVERRIDE;
   virtual void DragUpdate(aura::Window* target,
                           const aura::LocatedEvent& event) OVERRIDE;
   virtual void Drop(aura::Window* target,
                     const aura::LocatedEvent& event) OVERRIDE;
   virtual void DragCancel() OVERRIDE;
   virtual bool IsDragDropInProgress() OVERRIDE;
+  virtual gfx::NativeCursor GetDragCursor() OVERRIDE;
 
   // Overridden from aura::EventFilter:
   virtual bool PreHandleKeyEvent(aura::Window* target,
                                  aura::KeyEvent* event) OVERRIDE;
   virtual bool PreHandleMouseEvent(aura::Window* target,
                                    aura::MouseEvent* event) OVERRIDE;
   virtual ui::TouchStatus PreHandleTouchEvent(aura::Window* target,
                                               aura::TouchEvent* event) OVERRIDE;
   virtual ui::GestureStatus PreHandleGestureEvent(
       aura::Window* target,
@@ skipping 11 matching lines @@
   // Helper method to start drag widget flying back animation.
   void StartCanceledAnimation();
 
   // Helper method to reset everything.
   void Cleanup();
 
   scoped_ptr<DragImageView> drag_image_;
   gfx::Point drag_image_offset_;
   const ui::OSExchangeData* drag_data_;
   int drag_operation_;
+  gfx::NativeCursor drag_cursor_;
 
   // Window that is currently under the drag cursor.
   aura::Window* drag_window_;
   gfx::Point drag_start_location_;
 
   bool drag_drop_in_progress_;
 
   // Indicates whether the caller should be blocked on a drag/drop session.
   // Only be used for tests.
   bool should_block_during_drag_drop_;
 
   // Closure for quitting nested message loop.
   base::Closure quit_closure_;
 
   DISALLOW_COPY_AND_ASSIGN(DragDropController);
 };
 
 }  // namespace internal
 }  // namespace ash
 
 #endif  // ASH_DRAG_DROP_DRAG_DROP_CONTROLLER_H_