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

content/browser/web_contents/web_contents_view_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_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_drag_dest_gtk.h"
 #include "content/browser/web_contents/web_drag_source_gtk.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_view_delegate.h"
+#include "content/public/common/drop_data.h"
 #include "ui/base/gtk/gtk_expanded_container.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
-#include "webkit/common/webdropdata.h"
 
 using WebKit::WebDragOperation;
 using WebKit::WebDragOperationsMask;
 
 namespace content {
 namespace {
 
 // Called when the mouse leaves the widget. We notify our delegate.
 gboolean OnLeaveNotify(GtkWidget* widget, GdkEventCrossing* event,
                        WebContentsImpl* web_contents) {
@@ skipping 126 matching lines @@
   focus_store_.Store(GetNativeView());
 }
 
 void WebContentsViewGtk::RestoreFocus() {
   if (focus_store_.widget())
     gtk_widget_grab_focus(focus_store_.widget());
   else
     SetInitialFocus();
 }
 
-WebDropData* WebContentsViewGtk::GetDropData() const {
+DropData* WebContentsViewGtk::GetDropData() const {
   return drag_dest_->current_drop_data();
 }
 
 gfx::Rect WebContentsViewGtk::GetViewBounds() const {
   gfx::Rect rect;
   GdkWindow* window = gtk_widget_get_window(GetNativeView());
   if (!window) {
     rect.SetRect(0, 0, requested_size_.width(), requested_size_.height());
     return rect;
   }
@@ skipping 174 matching lines @@
                                        int selected_item,
                                        const std::vector<WebMenuItem>& items,
                                        bool right_aligned,
                                        bool allow_multiple_selection) {
   // External popup menus are only used on Mac and Android.
   NOTIMPLEMENTED();
 }
 
 // Render view DnD -------------------------------------------------------------
 
-void WebContentsViewGtk::StartDragging(const WebDropData& drop_data,
+void WebContentsViewGtk::StartDragging(const DropData& drop_data,
                                        WebDragOperationsMask ops,
                                        const gfx::ImageSkia& image,
                                        const gfx::Vector2d& image_offset,
                                        const DragEventSourceInfo& event_info) {
   DCHECK(GetContentNativeView());
 
   RenderWidgetHostViewGtk* view_gtk = static_cast<RenderWidgetHostViewGtk*>(
       web_contents_->GetRenderWidgetHostView());
   if (!view_gtk || !view_gtk->GetLastMouseDown() ||
       !drag_source_->StartDragging(drop_data, ops, view_gtk->GetLastMouseDown(),
@@ skipping 26 matching lines @@
   // We manually tell our RWHV to resize the renderer content.  This avoids
   // spurious resizes from GTK+.
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
   if (web_contents_->GetInterstitialPage())
     web_contents_->GetInterstitialPage()->SetSize(size);
 }
 
 }  // namespace content