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/common/os_exchange_data.h | |
| 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/common/os_exchange_data.h')
| -rw-r--r-- | chrome/common/os_exchange_data.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/common/os_exchange_data.h b/chrome/common/os_exchange_data.h index 55ed6ad..735e366 100644 --- a/chrome/common/os_exchange_data.h +++ b/chrome/common/os_exchange_data.h @@ -56,8 +56,9 @@ class OSExchangeData : public IDataObject { // Adds the bytes of a file (CFSTR_FILECONTENTS and CFSTR_FILEDESCRIPTOR). void SetFileContents(const std::wstring& filename, const std::string& file_contents); - // Adds a snippet of Windows HTML (CF_HTML). - void SetCFHtml(const std::wstring& cf_html); + // Adds a snippet of HTML. |html| is just raw html but this sets both + // text/html and CF_HTML. + void SetHtml(const std::wstring& html, const GURL& base_url); // These functions retrieve data of the specified type. If data exists, the // functions return and the result is in the out parameter. If the data does @@ -70,7 +71,7 @@ class OSExchangeData : public IDataObject { bool GetPickledData(CLIPFORMAT format, Pickle* data) const; bool GetFileContents(std::wstring* filename, std::string* file_contents) const; - bool GetCFHtml(std::wstring* cf_html) const; + bool GetHtml(std::wstring* html, GURL* base_url) const; // Test whether or not data of certain types is present, without actually // returning anything. @@ -141,4 +142,3 @@ class OSExchangeData : public IDataObject { }; #endif // #ifndef CHROME_COMMON_OS_EXCHANGE_DATA_H__ - |