Move WebDropData to content::DropData and split off conversion function.

content/browser/web_contents/web_drag_source_gtk.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_drag_source_gtk.h"
 
 #include <string>
 
 #include "base/nix/mime_util_xdg.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/browser/download/drag_download_file.h"
 #include "content/browser/download/drag_download_util.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/drag_utils_gtk.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/content_client.h"
+#include "content/public/common/drop_data.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/clipboard/custom_data_helper.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/gtk/gtk_compat.h"
 #include "ui/base/gtk/gtk_screen_util.h"
 #include "ui/gfx/gtk_util.h"
-#include "webkit/common/webdropdata.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 using WebKit::WebDragOperationNone;
 
 namespace content {
 
 WebDragSourceGtk::WebDragSourceGtk(WebContents* web_contents)
     : web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       drag_pixbuf_(NULL),
@@ skipping 21 matching lines @@
     gtk_grab_add(drag_widget_);
     gtk_grab_remove(drag_widget_);
     base::MessageLoopForUI::current()->RemoveObserver(this);
     drop_data_.reset();
   }
 
   gtk_widget_destroy(drag_widget_);
   gtk_widget_destroy(drag_icon_);
 }
 
-bool WebDragSourceGtk::StartDragging(const WebDropData& drop_data,
+bool WebDragSourceGtk::StartDragging(const DropData& drop_data,
                                      WebDragOperationsMask allowed_ops,
                                      GdkEventButton* last_mouse_down,
                                      const SkBitmap& image,
                                      const gfx::Vector2d& image_offset) {
   // Guard against re-starting before previous drag completed.
   if (drag_context_) {
     NOTREACHED();
     return false;
   }
 
@@ skipping 16 matching lines @@
                             &download_file_name_,
                             &download_url_)) {
     targets_mask |= ui::DIRECT_SAVE_FILE;
   }
   if (!drop_data.custom_data.empty())
     targets_mask |= ui::CUSTOM_DATA;
 
   // NOTE: Begin a drag even if no targets present. Otherwise, things like
   // draggable list elements will not work.
 
-  drop_data_.reset(new WebDropData(drop_data));
+  drop_data_.reset(new DropData(drop_data));
 
   // The image we get from WebKit makes heavy use of alpha-shading. This looks
   // bad on non-compositing WMs. Fall back to the default drag icon.
   if (!image.isNull() && ui::IsScreenComposited())
     drag_pixbuf_ = gfx::GdkPixbufFromSkBitmap(image);
   image_offset_ = image_offset;
 
   GtkTargetList* list = ui::GetTargetListFromCodeMask(targets_mask);
   if (targets_mask & ui::CHROME_WEBDROP_FILE_CONTENTS) {
     // Looking up the mime type can hit the disk.  http://crbug.com/84896
@@ skipping 275 matching lines @@
   cairo_clip(cr);
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   gdk_cairo_set_source_pixbuf(cr, drag_pixbuf_, 0, 0);
   cairo_paint(cr);
   cairo_destroy(cr);
 
   return TRUE;
 }
 
 }  // namespace content