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

content/browser/web_contents/web_contents_view_win.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_win.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_vector.h"
 #include "content/browser/renderer_host/render_view_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
@@ skipping 175 matching lines @@
 void WebContentsViewWin::StoreFocus() {
   if (delegate_)
     delegate_->StoreFocus();
 }
 
 void WebContentsViewWin::RestoreFocus() {
   if (delegate_)
     delegate_->RestoreFocus();
 }
 
-WebDropData* WebContentsViewWin::GetDropData() const {
+DropData* WebContentsViewWin::GetDropData() const {
   return drag_dest_->current_drop_data();
 }
 
 gfx::Rect WebContentsViewWin::GetViewBounds() const {
   RECT r;
   GetWindowRect(hwnd(), &r);
   return gfx::Rect(r);
 }
 
 RenderWidgetHostView* WebContentsViewWin::CreateViewForWidget(
@@ skipping 45 matching lines @@
                                        int item_height,
                                        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 WebContentsViewWin::StartDragging(const WebDropData& drop_data,
+void WebContentsViewWin::StartDragging(const DropData& drop_data,
                                        WebKit::WebDragOperationsMask operations,
                                        const gfx::ImageSkia& image,
                                        const gfx::Vector2d& image_offset,
                                        const DragEventSourceInfo& event_info) {
   drag_handler_ = new WebContentsDragWin(
       GetNativeView(),
       web_contents_,
       drag_dest_,
       base::Bind(&WebContentsViewWin::EndDragging, base::Unretained(this)));
   drag_handler_->StartDragging(drop_data, operations, image, image_offset);
@@ skipping 182 matching lines @@
   si.nPage = 10;
   si.nPos = 50;
 
   ::SetScrollInfo(hwnd(), SB_HORZ, &si, FALSE);
   ::SetScrollInfo(hwnd(), SB_VERT, &si, FALSE);
 
   return 1;
 }
 
 }  // namespace content