Index: ui/base/dragdrop/os_exchange_data_provider_aura.h |
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.h b/ui/base/dragdrop/os_exchange_data_provider_aura.h |
index 630d1698ce257340c50e7f139d1885c09efb11ac..38dfdda5105cdb9f0d4b0e487791d3dd49814a9f 100644 |
--- a/ui/base/dragdrop/os_exchange_data_provider_aura.h |
+++ b/ui/base/dragdrop/os_exchange_data_provider_aura.h |
@@ -26,15 +26,15 @@ class UI_EXPORT OSExchangeDataProviderAura |
virtual ~OSExchangeDataProviderAura(); |
// 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; |
@@ -46,8 +46,9 @@ class UI_EXPORT OSExchangeDataProviderAura |
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; |
@@ -66,11 +67,11 @@ class UI_EXPORT OSExchangeDataProviderAura |
int formats_; |
// String contents. |
- string16 string_; |
+ base::string16 string_; |
// URL contents. |
GURL url_; |
- string16 title_; |
+ base::string16 title_; |
// File name. |
std::vector<OSExchangeData::FileInfo> filenames_; |
@@ -83,7 +84,7 @@ class UI_EXPORT OSExchangeDataProviderAura |
gfx::Vector2d drag_image_offset_; |
// For HTML format |
- string16 html_; |
+ base::string16 html_; |
GURL base_url_; |
DISALLOW_COPY_AND_ASSIGN(OSExchangeDataProviderAura); |