diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 21:42:58 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-23 21:42:58 +0000 |
commit | b6d432335f59500e092de2be4fcf42ed303ae1c5 (patch) | |
tree | 0dae24ec6c0f89442ee37d18aeb17f5dcf48d6e0 /app/os_exchange_data_provider_gtk.h | |
parent | 599ea9fd7f5f029661916c191ff89b7358719f81 (diff) | |
download | chromium_src-b6d432335f59500e092de2be4fcf42ed303ae1c5.zip chromium_src-b6d432335f59500e092de2be4fcf42ed303ae1c5.tar.gz chromium_src-b6d432335f59500e092de2be4fcf42ed303ae1c5.tar.bz2 |
Implements file contents support in OSExchangeData and DropTarget
for gtk. Makes html and file contents support in OSExchangeData only
for windows (as that is the only place we need it), and makes dragging
files work.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/232002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26995 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/os_exchange_data_provider_gtk.h')
-rw-r--r-- | app/os_exchange_data_provider_gtk.h | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/app/os_exchange_data_provider_gtk.h b/app/os_exchange_data_provider_gtk.h index 5974cde..ffbb182 100644 --- a/app/os_exchange_data_provider_gtk.h +++ b/app/os_exchange_data_provider_gtk.h @@ -59,27 +59,23 @@ class OSExchangeDataProviderGtk : public OSExchangeData::Provider { virtual void SetFilename(const std::wstring& full_path); virtual void SetPickledData(OSExchangeData::CustomFormat format, const Pickle& data); - virtual void SetFileContents(const std::wstring& filename, - const std::string& file_contents); - virtual void SetHtml(const std::wstring& html, const GURL& base_url); virtual bool GetString(std::wstring* data) const; virtual bool GetURLAndTitle(GURL* url, std::wstring* title) const; virtual bool GetFilename(std::wstring* full_path) const; virtual bool GetPickledData(OSExchangeData::CustomFormat format, Pickle* data) const; - virtual bool GetFileContents(std::wstring* filename, - std::string* file_contents) const; - virtual bool GetHtml(std::wstring* html, GURL* base_url) const; virtual bool HasString() const; virtual bool HasURL() const; virtual bool HasFile() const; - virtual bool HasFileContents() const; - virtual bool HasHtml() const; virtual bool HasCustomFormat(OSExchangeData::CustomFormat format) const; private: typedef std::map<OSExchangeData::CustomFormat, Pickle> PickleData; + // Returns true if |formats_| contains a string format and the string can be + // parsed as a URL. + bool GetPlainTextURL(GURL* url) const; + // These are the possible formats the OSExchangeData may contain. Don't // confuse this with the actual formats that have been set, which are // |formats_| and |custom_formats_|. @@ -97,13 +93,8 @@ class OSExchangeDataProviderGtk : public OSExchangeData::Provider { GURL url_; string16 title_; - // File contents. - string16 filename_; - std::string file_contents_; - - // HTML contents. - string16 html_; - GURL base_url_; + // File name. + std::string filename_; // PICKLED_DATA contents. PickleData pickle_data_; |