Get drag and drop working for win aura.

content/browser/web_contents/web_contents_view_aura.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 "content/browser/web_contents/web_contents_view_aura.h"
 
 #include "base/auto_reset.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/renderer_host/dip_util.h"
 #include "content/browser/renderer_host/overscroll_controller.h"
@@ skipping 15 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/drag_drop_client.h"
 #include "ui/aura/client/drag_drop_delegate.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/root_window_observer.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
-#include "ui/base/dragdrop/os_exchange_data_provider_aura.h"
 #include "ui/base/events/event.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/hit_test.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
+#include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/screen.h"
 #include "webkit/glue/webdropdata.h"
 
+#if defined(OS_WIN)
+#include "ui/base/clipboard/clipboard_util_win.h"
+#endif
+
 namespace content {
 WebContentsView* CreateWebContentsView(
     WebContentsImpl* web_contents,
     WebContentsViewDelegate* delegate,
     RenderViewHostDelegateView** render_view_host_delegate_view) {
   WebContentsViewAura* rv = new WebContentsViewAura(web_contents, delegate);
   *render_view_host_delegate_view = rv;
   return rv;
 }
 
@@ skipping 65 matching lines @@
   aura::Window* window() const { return window_; }
 
  private:
   aura::Window* window_;
   WebContentsImpl* contents_;
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(WebDragSourceAura);
 };
 
-// Utility to fill a ui::OSExchangeDataProviderAura object from WebDropData.
+// Utility to fill a ui::OSExchangeDataProvider object from WebDropData.
 void PrepareDragData(const WebDropData& drop_data,
-                     ui::OSExchangeDataProviderAura* provider) {
+                     ui::OSExchangeData::Provider* provider) {
   if (!drop_data.text.string().empty())
     provider->SetString(drop_data.text.string());
   if (drop_data.url.is_valid())
     provider->SetURL(drop_data.url, drop_data.url_title);
   if (!drop_data.html.string().empty())
     provider->SetHtml(drop_data.html.string(), drop_data.html_base_url);
   if (!drop_data.filenames.empty()) {
     std::vector<ui::OSExchangeData::FileInfo> filenames;
     for (std::vector<WebDropData::FileInfo>::const_iterator it =
              drop_data.filenames.begin();
          it != drop_data.filenames.end(); ++it) {
       filenames.push_back(
           ui::OSExchangeData::FileInfo(
               FilePath::FromUTF8Unsafe(UTF16ToUTF8(it->path)),
               FilePath::FromUTF8Unsafe(UTF16ToUTF8(it->display_name))));
     }
     provider->SetFilenames(filenames);
   }
   if (!drop_data.custom_data.empty()) {
     Pickle pickle;
     ui::WriteCustomDataToPickle(drop_data.custom_data, &pickle);
+#if defined(OS_WIN)
+    provider->SetPickledData(
+        ui::ClipboardUtil::GetWebCustomDataFormat()->cfFormat, pickle);
+#else
     provider->SetPickledData(ui::Clipboard::GetWebCustomDataFormatType(),
                              pickle);
+#endif
   }
 }
 
 // Utility to fill a WebDropData object from ui::OSExchangeData.
 void PrepareWebDropData(WebDropData* drop_data,
                         const ui::OSExchangeData& data) {
   string16 plain_text;
   data.GetString(&plain_text);
   if (!plain_text.empty())
     drop_data->text = NullableString16(plain_text, false);
@@ skipping 19 matching lines @@
     for (std::vector<ui::OSExchangeData::FileInfo>::const_iterator
              it = files.begin(); it != files.end(); ++it) {
       drop_data->filenames.push_back(
           WebDropData::FileInfo(
               UTF8ToUTF16(it->path.AsUTF8Unsafe()),
               UTF8ToUTF16(it->display_name.AsUTF8Unsafe())));
     }
   }
 
   Pickle pickle;
+#if defined(OS_WIN)
+  if (data.GetPickledData(ui::ClipboardUtil::GetWebCustomDataFormat()->cfFormat,
+                          &pickle))
+#else
   if (data.GetPickledData(ui::Clipboard::GetWebCustomDataFormatType(),
                           &pickle))
+#endif
     ui::ReadCustomDataIntoMap(pickle.data(), pickle.size(),
                               &drop_data->custom_data);
 }
 
 // Utilities to convert between WebKit::WebDragOperationsMask and
 // ui::DragDropTypes.
 int ConvertFromWeb(WebKit::WebDragOperationsMask ops) {
   int drag_op = ui::DragDropTypes::DRAG_NONE;
   if (ops & WebKit::WebDragOperationCopy)
     drag_op |= ui::DragDropTypes::DRAG_COPY;
@@ skipping 457 matching lines @@
 void WebContentsViewAura::StartDragging(
     const WebDropData& drop_data,
     WebKit::WebDragOperationsMask operations,
     const gfx::ImageSkia& image,
     const gfx::Vector2d& image_offset,
     const DragEventSourceInfo& event_info) {
   aura::RootWindow* root_window = GetNativeView()->GetRootWindow();
   if (!aura::client::GetDragDropClient(root_window))
     return;
 
-  ui::OSExchangeDataProviderAura* provider = new ui::OSExchangeDataProviderAura;
+  ui::OSExchangeData::Provider* provider = ui::OSExchangeData::CreateProvider();
   PrepareDragData(drop_data, provider);
+
+  ui::OSExchangeData data(provider);  // takes ownership of |provider|.
+
   if (!image.isNull()) {
-    provider->set_drag_image(image);
-    provider->set_drag_image_offset(image_offset);
+    drag_utils::SetDragImageOnDataObject(image,
+        gfx::Size(image.width(), image.height()), image_offset, &data);
   }
-  ui::OSExchangeData data(provider);  // takes ownership of |provider|.
 
   scoped_ptr<WebDragSourceAura> drag_source(
       new WebDragSourceAura(GetNativeView(), web_contents_));
 
   // We need to enable recursive tasks on the message loop so we can get
   // updates while in the system DoDragDrop loop.
   int result_op = 0;
   {
     gfx::NativeView content_native_view = GetContentNativeView();
     MessageLoop::ScopedNestableTaskAllower allow(MessageLoop::current());
@@ skipping 290 matching lines @@
       event.location(),
       gfx::Screen::GetScreenFor(GetNativeView())->GetCursorScreenPoint(),
       ConvertAuraEventFlagsToWebInputEventModifiers(event.flags()));
   if (drag_dest_delegate_)
     drag_dest_delegate_->OnDrop();
   current_drop_data_.reset();
   return current_drag_op_;
 }
 
 }  // namespace content