diff options
| author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 11:11:22 +0000 |
|---|---|---|
| committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 11:11:22 +0000 |
| commit | dc293a7a4addd6d8b93194588a932b1249739914 (patch) | |
| tree | 273bbf4d77409f6eb4fdf25681416e9de765bdd8 /content/browser/web_contents/web_drag_dest_gtk.cc | |
| parent | 33539eced948a06b9e8dd7891eadeb515921955a (diff) | |
| download | chromium_src-dc293a7a4addd6d8b93194588a932b1249739914.zip chromium_src-dc293a7a4addd6d8b93194588a932b1249739914.tar.gz chromium_src-dc293a7a4addd6d8b93194588a932b1249739914.tar.bz2 | |
Move WebDropData to content::DropData and split off conversion function.
The WebKit::WebDragData constructor is now provided by DropDataBuilder,
which lives in content/renderer/.
R=jam@chromium.org
TBR=cevans@chromium.org
BUG=237267
Review URL: https://chromiumcodereview.appspot.com/18281002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/web_contents/web_drag_dest_gtk.cc')
| -rw-r--r-- | content/browser/web_contents/web_drag_dest_gtk.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/content/browser/web_contents/web_drag_dest_gtk.cc b/content/browser/web_contents/web_drag_dest_gtk.cc index c745d31..4c878cf 100644 --- a/content/browser/web_contents/web_drag_dest_gtk.cc +++ b/content/browser/web_contents/web_drag_dest_gtk.cc @@ -110,7 +110,7 @@ gboolean WebDragDestGtk::OnDragMotion(GtkWidget* sender, guint time) { if (context_ != context) { context_ = context; - drop_data_.reset(new WebDropData); + drop_data_.reset(new DropData); is_drop_target_ = false; if (delegate()) @@ -204,8 +204,7 @@ void WebDragDestGtk::OnDragDataReceived( if (url.SchemeIs(chrome::kFileScheme) && net::FileURLToFilePath(url, &file_path)) { drop_data_->filenames.push_back( - WebDropData::FileInfo(UTF8ToUTF16(file_path.value()), - string16())); + DropData::FileInfo(UTF8ToUTF16(file_path.value()), string16())); // This is a hack. Some file managers also populate text/plain with // a file URL when dragging files, so we clear it to avoid exposing // it to the web content. |