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

content/public/browser/web_contents_delegate.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_DELEGATE_H_
 #define CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_DELEGATE_H_
 
 #include <set>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/navigation_type.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/window_container_type.h"
 #include "third_party/WebKit/public/web/WebDragOperation.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/rect_f.h"
 #include "ui/gfx/vector2d.h"
 
 class GURL;
-struct WebDropData;
 
 namespace base {
 class FilePath;
 class ListValue;
 }
 
 namespace content {
 class BrowserContext;
 class ColorChooser;
 class DownloadItem;
 class JavaScriptDialogManager;
 class PageState;
 class RenderViewHost;
 class WebContents;
 class WebContentsImpl;
 struct ContextMenuParams;
+struct DropData;
 struct FileChooserParams;
 struct NativeWebKeyboardEvent;
 struct SSLStatus;
 }
 
 namespace gfx {
 class Point;
 class Rect;
 class Size;
 }
@@ skipping 211 matching lines @@
   // pressed, or a touch-gesture begins).
   virtual void HandlePointerActivate() {}
 
   virtual void HandleGestureBegin() {}
   virtual void HandleGestureEnd() {}
 
   // Called when an external drag event enters the web contents window. Return
   // true to allow dragging and dropping on the web contents window or false to
   // cancel the operation. This method is used by Chromium Embedded Framework.
   virtual bool CanDragEnter(WebContents* source,
-                            const WebDropData& data,
+                            const DropData& data,
                             WebKit::WebDragOperationsMask operations_allowed);
 
   // Render view drag n drop ended.
   virtual void DragEnded() {}
 
   // Shows the repost form confirmation dialog box.
   virtual void ShowRepostFormWarningDialog(WebContents* source) {}
 
   // Allows delegate to override navigation to the history entries.
   // Returns true to allow WebContents to continue with the default processing.
@@ skipping 154 matching lines @@
   // Called when |this| is no longer the WebContentsDelegate for |source|.
   void Detach(WebContents* source);
 
   // The WebContents that this is currently a delegate for.
   std::set<WebContents*> attached_contents_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_DELEGATE_H_