diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 01:20:01 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-19 01:20:01 +0000 |
| commit | 22cf8687fe6c4fc4dbb2b9b2ac41d7d45f656d83 (patch) | |
| tree | df838980effe3721bdc41b6acea356bf6352df8e /chrome/browser/web_contents_view_win.cc | |
| parent | 234ebdecf98582ca141b9066b1e5f4f74d3bdbff (diff) | |
| download | chromium_src-22cf8687fe6c4fc4dbb2b9b2ac41d7d45f656d83.zip chromium_src-22cf8687fe6c4fc4dbb2b9b2ac41d7d45f656d83.tar.gz chromium_src-22cf8687fe6c4fc4dbb2b9b2ac41d7d45f656d83.tar.bz2 | |
Remove cf_html from webdropdata.h. This is windows
specific code so we should handle it before we get
to webkit.
CF_HTML needs the source URL to resolve relative URLs
so I added that to the format and plumb it through
from webcore.
I also did some small refactoring so we only have one
implementation of converting to/from CF_HTML and regular
markup. We can tweak these converters (and add unit tests)
in follow up changes.
Review URL: http://codereview.chromium.org/11247
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_contents_view_win.cc')
| -rw-r--r-- | chrome/browser/web_contents_view_win.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/web_contents_view_win.cc b/chrome/browser/web_contents_view_win.cc index dcf8136..90da9cd 100644 --- a/chrome/browser/web_contents_view_win.cc +++ b/chrome/browser/web_contents_view_win.cc @@ -100,8 +100,8 @@ void WebContentsViewWin::StartDragging(const WebDropData& drop_data) { data->SetFileContents(drop_data.file_description_filename, drop_data.file_contents); } - if (!drop_data.cf_html.empty()) - data->SetCFHtml(drop_data.cf_html); + if (!drop_data.text_html.empty()) + data->SetHtml(drop_data.text_html, drop_data.html_base_url); if (drop_data.url.is_valid()) { if (drop_data.url.SchemeIs("javascript")) { // We don't want to allow javascript URLs to be dragged to the desktop, |