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

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_aurax11.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_aurax11.h
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
index 09568e2093a53e9e09d9f2b89eb0bc5a42a58d5a..621256331753204b5d56344af563ca00e9addb51 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
@@ -56,15 +56,15 @@ class UI_EXPORT OSExchangeDataProviderAuraX11
SelectionFormatMap GetFormatMap() const;
// Overridden from OSExchangeData::Provider:
- virtual void SetString(const string16& data) OVERRIDE;
- virtual void SetURL(const GURL& url, const string16& title) OVERRIDE;
+ virtual void SetString(const base::string16& data) OVERRIDE;
+ virtual void SetURL(const GURL& url, const base::string16& title) OVERRIDE;
virtual void SetFilename(const base::FilePath& path) OVERRIDE;
virtual void SetFilenames(
const std::vector<OSExchangeData::FileInfo>& filenames) OVERRIDE;
virtual void SetPickledData(const OSExchangeData::CustomFormat& format,
const Pickle& data) OVERRIDE;
- virtual bool GetString(string16* data) const OVERRIDE;
- virtual bool GetURLAndTitle(GURL* url, string16* title) const OVERRIDE;
+ virtual bool GetString(base::string16* data) const OVERRIDE;
+ virtual bool GetURLAndTitle(GURL* url, base::string16* title) const OVERRIDE;
virtual bool GetFilename(base::FilePath* path) const OVERRIDE;
virtual bool GetFilenames(
std::vector<OSExchangeData::FileInfo>* filenames) const OVERRIDE;
@@ -76,8 +76,9 @@ class UI_EXPORT OSExchangeDataProviderAuraX11
virtual bool HasCustomFormat(const OSExchangeData::CustomFormat& format) const
OVERRIDE;
- virtual void SetHtml(const string16& html, const GURL& base_url) OVERRIDE;
- virtual bool GetHtml(string16* html, GURL* base_url) const OVERRIDE;
+ virtual void SetHtml(const base::string16& html,
+ const GURL& base_url) OVERRIDE;
+ virtual bool GetHtml(base::string16* html, GURL* base_url) const OVERRIDE;
virtual bool HasHtml() const OVERRIDE;
virtual void SetDragImage(const gfx::ImageSkia& image,
const gfx::Vector2d& cursor_offset) OVERRIDE;
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aura.cc ('k') | ui/base/dragdrop/os_exchange_data_provider_aurax11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698