Get drag and drop working on Win Ash.

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"
 #include "ash/wm/cursor_manager.h"
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/client/drag_drop_delegate.h"
 #include "ui/aura/env.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/animation/linear_animation.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "ui/base/dragdrop/os_exchange_data_provider_aura.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/events/event.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/native_widget_aura.h"
 
 namespace ash {
 namespace internal {
 
@@ skipping 66 matching lines @@
 int DragDropController::StartDragAndDrop(
     const ui::OSExchangeData& data,
     aura::RootWindow* root_window,
     aura::Window* source_window,
     const gfx::Point& root_location,
     int operation,
     ui::DragDropTypes::DragEventSource source) {
   if (IsDragDropInProgress())
     return 0;
 
-#if defined(OS_WIN)
-  // TODO(win_ash): need to figure out how this will work in Metro, since
-  // OSExchangeDataProviderAura isn't used in Windows builds. Two alternatives:
-  // 1) Use OSExchangeDataProviderAura in Ash and OSExchangeDataProviderWin
-  //    elsewhere. This will complicate creating an ui::OSExchangeData to pass
-  //    in more context.
-  // 2) Add methods to get the image and offset in the base interface of these
-  //    implementations to get to this data here.
-  NOTIMPLEMENTED();
-  return 0;
-#else
-  const ui::OSExchangeDataProviderAura& provider =
-      static_cast<const ui::OSExchangeDataProviderAura&>(data.provider());
+  const ui::OSExchangeData::Provider* provider = &data.provider();
   // We do not support touch drag/drop without a drag image.
   if (source == ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH &&
-      provider.drag_image().size().IsEmpty())
+      provider->GetDragImage().size().IsEmpty())
     return 0;
 
   current_drag_event_source_ = source;
   DragDropTracker* tracker = new DragDropTracker(root_window);
   if (source == ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH) {
     // We need to transfer the current gesture sequence and the GR's touch event
     // queue to the |drag_drop_tracker_|'s capture window so that when it takes
     // capture, it still gets a valid gesture state.
     root_window->gesture_recognizer()->TransferEventsTo(source_window,
         tracker->capture_window());
@@ skipping 14 matching lines @@
 
   float drag_image_scale = 1;
   int drag_image_vertical_offset = 0;
   if (source == ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH) {
     drag_image_scale = kTouchDragImageScale;
     drag_image_vertical_offset = kTouchDragImageVerticalOffset;
   }
   gfx::Point start_location = root_location;
   ash::wm::ConvertPointToScreen(root_window, &start_location);
   drag_image_final_bounds_for_cancel_animation_ = gfx::Rect(
-      start_location - provider.drag_image_offset(),
-      provider.drag_image().size());
+      start_location - provider->GetDragImageOffset(),
+      provider->GetDragImage().size());
   drag_image_.reset(new DragImageView);
-  drag_image_->SetImage(provider.drag_image());
-  drag_image_offset_ = provider.drag_image_offset();
+  drag_image_->SetImage(provider->GetDragImage());
+  drag_image_offset_ = provider->GetDragImageOffset();
   gfx::Rect drag_image_bounds(start_location, drag_image_->GetPreferredSize());
   drag_image_bounds = AdjustDragImageBoundsForScaleAndOffset(drag_image_bounds,
       drag_image_vertical_offset, drag_image_scale, &drag_image_offset_);
   drag_image_->SetBoundsInScreen(drag_image_bounds);
   drag_image_->SetWidgetVisible(true);
 
   drag_window_ = NULL;
 
   // Ends cancel animation if it's in progress.
   if (cancel_animation_.get())
@@ skipping 10 matching lines @@
 #endif  // !defined(OS_MACOSX)
 
   if (!cancel_animation_.get() || !cancel_animation_->is_animating() ||
       !pending_long_tap_.get()) {
     // If drag cancel animation is running, this cleanup is done when the
     // animation completes.
     if (drag_source_window_)
       drag_source_window_->RemoveObserver(this);
     drag_source_window_ = NULL;
   }
-#endif
 
   return drag_operation_;
 }
 
 void DragDropController::DragUpdate(aura::Window* target,
                                     const ui::LocatedEvent& event) {
   aura::client::DragDropDelegate* delegate = NULL;
   if (target != drag_window_) {
     if (drag_window_) {
       if ((delegate = aura::client::GetDragDropDelegate(drag_window_)))
@@ skipping 297 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