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

content/browser/web_contents/web_drag_dest_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_drag_dest_win.h"
 
 #include <windows.h>
 #include <shlobj.h>
 
 #include "base/win/win_util.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_drag_utils_win.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_drag_dest_delegate.h"
+#include "content/public/common/drop_data.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/base/clipboard/clipboard_util_win.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/os_exchange_data_provider_win.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/gfx/point.h"
-#include "webkit/common/webdropdata.h"
 
 using WebKit::WebDragOperationNone;
 using WebKit::WebDragOperationCopy;
 using WebKit::WebDragOperationLink;
 using WebKit::WebDragOperationMove;
 using WebKit::WebDragOperationGeneric;
 
 namespace content {
 namespace {
 
@@ skipping 18 matching lines @@
     modifier_state |= WebKit::WebInputEvent::ControlKey;
   if (base::win::IsAltPressed())
     modifier_state |= WebKit::WebInputEvent::AltKey;
   if (::GetKeyState(VK_LWIN) & kHighBitMaskShort)
     modifier_state |= WebKit::WebInputEvent::MetaKey;
   if (::GetKeyState(VK_RWIN) & kHighBitMaskShort)
     modifier_state |= WebKit::WebInputEvent::MetaKey;
   return modifier_state;
 }
 
-// Helper method for converting Window's specific IDataObject to a WebDropData
+// Helper method for converting Window's specific IDataObject to a DropData
 // object.
-void PopulateWebDropData(IDataObject* data_object, WebDropData* drop_data) {
+void PopulateDropData(IDataObject* data_object, DropData* drop_data) {
   base::string16 url_str;
   if (ui::ClipboardUtil::GetUrl(
           data_object, &url_str, &drop_data->url_title, false)) {
     GURL test_url(url_str);
     if (test_url.is_valid())
       drop_data->url = test_url;
   }
   std::vector<base::string16> filenames;
   ui::ClipboardUtil::GetFilenames(data_object, &filenames);
   for (size_t i = 0; i < filenames.size(); ++i)
     drop_data->filenames.push_back(
-        WebDropData::FileInfo(filenames[i], base::string16()));
+        DropData::FileInfo(filenames[i], base::string16()));
   base::string16 text;
   ui::ClipboardUtil::GetPlainText(data_object, &text);
   if (!text.empty()) {
     drop_data->text = base::NullableString16(text, false);
   }
   base::string16 html;
   std::string html_base_url;
   ui::ClipboardUtil::GetHtml(data_object, &html, &html_base_url);
   if (!html.empty()) {
     drop_data->html = base::NullableString16(html, false);
@@ skipping 59 matching lines @@
 
 WebDragDest::~WebDragDest() {
 }
 
 DWORD WebDragDest::OnDragEnter(IDataObject* data_object,
                                DWORD key_state,
                                POINT cursor_position,
                                DWORD effects) {
   current_rvh_ = web_contents_->GetRenderViewHost();
 
-  // TODO(tc): PopulateWebDropData can be slow depending on what is in the
+  // TODO(tc): PopulateDropData can be slow depending on what is in the
   // IDataObject.  Maybe we can do this in a background thread.
-  scoped_ptr<WebDropData> drop_data;
-  drop_data.reset(new WebDropData());
-  PopulateWebDropData(data_object, drop_data.get());
+  scoped_ptr<DropData> drop_data;
+  drop_data.reset(new DropData());
+  PopulateDropData(data_object, drop_data.get());
 
   if (drop_data->url.is_empty())
     ui::OSExchangeDataProviderWin::GetPlainTextURL(data_object,
                                                    &drop_data->url);
 
   // Give the delegate an opportunity to cancel the drag.
   canceled_ = !web_contents_->GetDelegate()->CanDragEnter(
       web_contents_,
       *drop_data,
       WinDragOpMaskToWebDragOpMask(effects));
@@ skipping 105 matching lines @@
   // This isn't always correct, but at least it's a close approximation.
   // For now, we always map a move to a copy to prevent potential data loss.
   DWORD drop_effect = WebDragOpToWinDragOp(drag_cursor_);
   DWORD result = drop_effect != DROPEFFECT_MOVE ? drop_effect : DROPEFFECT_COPY;
 
   drop_data_.reset();
   return result;
 }
 
 }  // namespace content