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

Unified Diff: webkit/glue/webdropdata.cc

Issue 11247: Remove cf_html from webdropdata.h. This is windows (Closed)
Patch Set: fix feedback Created 12 years, 1 month 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 | « webkit/glue/webdropdata.h ('k') | webkit/port/platform/chromium/ChromiumDataObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/glue/webdropdata.cc
diff --git a/webkit/glue/webdropdata.cc b/webkit/glue/webdropdata.cc
index 28ed52d31f2d921ee475334c2dfecbb85a932329..cd96169ea7bda99c45c9f54118ed4ba72b9f5545 100644
--- a/webkit/glue/webdropdata.cc
+++ b/webkit/glue/webdropdata.cc
@@ -20,8 +20,11 @@ void WebDropData::PopulateWebDropData(IDataObject* data_object,
}
ClipboardUtil::GetFilenames(data_object, &drop_data->filenames);
ClipboardUtil::GetPlainText(data_object, &drop_data->plain_text);
- ClipboardUtil::GetCFHtml(data_object, &drop_data->cf_html);
- ClipboardUtil::GetTextHtml(data_object, &drop_data->text_html);
+ std::string base_url;
+ ClipboardUtil::GetHtml(data_object, &drop_data->text_html, &base_url);
+ if (!base_url.empty()) {
+ drop_data->html_base_url = GURL(base_url);
+ }
ClipboardUtil::GetFileContents(data_object,
&drop_data->file_description_filename, &drop_data->file_contents);
}
« no previous file with comments | « webkit/glue/webdropdata.h ('k') | webkit/port/platform/chromium/ChromiumDataObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698