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

content/browser/web_contents/web_contents_view_guest.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_guest.h"
 
 #include "build/build_config.h"
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.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_guest.h"
 #include "content/browser/web_contents/interstitial_page_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/drag_messages.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/context_menu_params.h"
+#include "content/public/common/drop_data.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 {
 
 WebContentsViewGuest::WebContentsViewGuest(
     WebContentsImpl* web_contents,
     BrowserPluginGuest* guest,
     WebContentsViewPort* platform_view,
@@ skipping 126 matching lines @@
 }
 
 void WebContentsViewGuest::Focus() {
   platform_view_->Focus();
 }
 
 void WebContentsViewGuest::StoreFocus() {
   platform_view_->StoreFocus();
 }
 
-WebDropData* WebContentsViewGuest::GetDropData() const {
+DropData* WebContentsViewGuest::GetDropData() const {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 void WebContentsViewGuest::UpdateDragCursor(WebDragOperation operation) {
   RenderViewHostImpl* embedder_render_view_host =
       static_cast<RenderViewHostImpl*>(
           guest_->embedder_web_contents()->GetRenderViewHost());
   CHECK(embedder_render_view_host);
   RenderViewHostDelegateView* view =
@@ skipping 17 matching lines @@
                                          double item_font_size,
                                          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();
 }
 
 void WebContentsViewGuest::StartDragging(
-    const WebDropData& drop_data,
+    const DropData& drop_data,
     WebDragOperationsMask ops,
     const gfx::ImageSkia& image,
     const gfx::Vector2d& image_offset,
     const DragEventSourceInfo& event_info) {
   WebContentsImpl* embedder_web_contents = guest_->embedder_web_contents();
   embedder_web_contents->GetBrowserPluginEmbedder()->StartDrag(guest_);
   RenderViewHostImpl* embedder_render_view_host =
       static_cast<RenderViewHostImpl*>(
           embedder_web_contents->GetRenderViewHost());
   CHECK(embedder_render_view_host);
   RenderViewHostDelegateView* view =
       embedder_render_view_host->GetDelegate()->GetDelegateView();
   if (view)
     view->StartDragging(drop_data, ops, image, image_offset, event_info);
   else
     embedder_web_contents->SystemDragEnded();
 }
 
 }  // namespace content