Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Unified Diff: content/browser/web_contents/web_drag_dest_gtk.cc

Issue 18281002: Move WebDropData to content::DropData and split off conversion function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Mac build error. Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/web_contents/web_drag_dest_gtk.h ('k') | content/browser/web_contents/web_drag_dest_mac.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/web_contents/web_drag_dest_gtk.cc
diff --git a/content/browser/web_contents/web_drag_dest_gtk.cc b/content/browser/web_contents/web_drag_dest_gtk.cc
index c745d31b12ba16559967ba63527ec60eb7f549c8..4c878cf12d528dad02c0267d9690d3ea1029a481 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.
« no previous file with comments | « content/browser/web_contents/web_drag_dest_gtk.h ('k') | content/browser/web_contents/web_drag_dest_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698