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

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_win.h

Issue 17951002: ui/base/dragdrop: Use base::string16 now that string16 was moved into base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: ui/base/dragdrop/os_exchange_data_provider_win.h
diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.h b/ui/base/dragdrop/os_exchange_data_provider_win.h
index 4cf2bead1ca4a89e9034505bc833bb621b12246d..1fbf51d710cf80034b357334744e285349d91a76 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_win.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_win.h
@@ -147,8 +147,8 @@ class UI_EXPORT OSExchangeDataProviderWin : public OSExchangeData::Provider {
IDataObjectAsyncCapability* async_operation() const { return data_.get(); }
// OSExchangeData::Provider methods.
- virtual void SetString(const string16& data);
- virtual void SetURL(const GURL& url, const string16& title);
+ virtual void SetString(const base::string16& data);
+ virtual void SetURL(const GURL& url, const base::string16& title);
virtual void SetFilename(const base::FilePath& path);
virtual void SetFilenames(
const std::vector<OSExchangeData::FileInfo>& filenames);
@@ -156,10 +156,10 @@ class UI_EXPORT OSExchangeDataProviderWin : public OSExchangeData::Provider {
const Pickle& data);
virtual void SetFileContents(const base::FilePath& filename,
const std::string& file_contents);
- virtual void SetHtml(const string16& html, const GURL& base_url);
+ virtual void SetHtml(const base::string16& html, const GURL& base_url);
- virtual bool GetString(string16* data) const;
- virtual bool GetURLAndTitle(GURL* url, string16* title) const;
+ virtual bool GetString(base::string16* data) const;
+ virtual bool GetURLAndTitle(GURL* url, base::string16* title) const;
virtual bool GetFilename(base::FilePath* path) const;
virtual bool GetFilenames(
std::vector<OSExchangeData::FileInfo>* filenames) const;
@@ -167,7 +167,7 @@ class UI_EXPORT OSExchangeDataProviderWin : public OSExchangeData::Provider {
Pickle* data) const;
virtual bool GetFileContents(base::FilePath* filename,
std::string* file_contents) const;
- virtual bool GetHtml(string16* html, GURL* base_url) const;
+ virtual bool GetHtml(base::string16* html, GURL* base_url) const;
virtual bool HasString() const;
virtual bool HasURL() const;
virtual bool HasFile() const;
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aurax11.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698