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

Unified Diff: ui/base/dragdrop/os_exchange_data_provider_aura.cc

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_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;
« no previous file with comments | « ui/base/dragdrop/os_exchange_data_provider_aura.h ('k') | ui/base/dragdrop/os_exchange_data_provider_aurax11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698