Index: ui/base/dragdrop/os_exchange_data_provider_aura.cc |
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.cc b/ui/base/dragdrop/os_exchange_data_provider_aura.cc |
index 88f320277d7ca9f94bb8c94cc5960bc825501fbc..a02ab1216116039756a40f09adb8f6ea71c7b868 100644 |
--- a/ui/base/dragdrop/os_exchange_data_provider_aura.cc |
+++ b/ui/base/dragdrop/os_exchange_data_provider_aura.cc |
@@ -18,13 +18,13 @@ OSExchangeDataProviderAura::OSExchangeDataProviderAura() |
OSExchangeDataProviderAura::~OSExchangeDataProviderAura() {} |
-void OSExchangeDataProviderAura::SetString(const string16& data) { |
+void OSExchangeDataProviderAura::SetString(const base::string16& data) { |
string_ = data; |
formats_ |= OSExchangeData::STRING; |
} |
void OSExchangeDataProviderAura::SetURL(const GURL& url, |
- const string16& title) { |
+ const base::string16& title) { |
url_ = url; |
title_ = title; |
formats_ |= OSExchangeData::URL; |
@@ -49,7 +49,7 @@ void OSExchangeDataProviderAura::SetPickledData( |
formats_ |= OSExchangeData::PICKLED_DATA; |
} |
-bool OSExchangeDataProviderAura::GetString(string16* data) const { |
+bool OSExchangeDataProviderAura::GetString(base::string16* data) const { |
if ((formats_ & OSExchangeData::STRING) == 0) |
return false; |
*data = string_; |
@@ -57,7 +57,7 @@ bool OSExchangeDataProviderAura::GetString(string16* data) const { |
} |
bool OSExchangeDataProviderAura::GetURLAndTitle(GURL* url, |
- string16* title) const { |
+ base::string16* title) const { |
if ((formats_ & OSExchangeData::URL) == 0) { |
title->clear(); |
return GetPlainTextURL(url); |
@@ -119,14 +119,14 @@ bool OSExchangeDataProviderAura::HasCustomFormat( |
return pickle_data_.find(format) != pickle_data_.end(); |
} |
-void OSExchangeDataProviderAura::SetHtml(const string16& html, |
+void OSExchangeDataProviderAura::SetHtml(const base::string16& html, |
const GURL& base_url) { |
formats_ |= OSExchangeData::HTML; |
html_ = html; |
base_url_ = base_url; |
} |
-bool OSExchangeDataProviderAura::GetHtml(string16* html, |
+bool OSExchangeDataProviderAura::GetHtml(base::string16* html, |
GURL* base_url) const { |
if ((formats_ & OSExchangeData::HTML) == 0) |
return false; |