diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 12:57:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-27 12:57:31 +0000 |
| commit | 21b06f5082d5cf95c7e5857ab85e6c8b731c1104 (patch) | |
| tree | 35bdf041d7d275646deb98bdd121f370e9d02690 /ui/base/dragdrop/os_exchange_data_provider_aura.cc | |
| parent | b66f792c9ad058a0004ed1c5a5fcaa2c30afc01a (diff) | |
| download | chromium_src-21b06f5082d5cf95c7e5857ab85e6c8b731c1104.zip chromium_src-21b06f5082d5cf95c7e5857ab85e6c8b731c1104.tar.gz chromium_src-21b06f5082d5cf95c7e5857ab85e6c8b731c1104.tar.bz2 | |
ui/base/dragdrop: Use base::string16 now that string16 was moved into base namespace.
base/string16.h was moved into base namespace in r191198 by Brett.
BUG=None
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/17951002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208906 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/dragdrop/os_exchange_data_provider_aura.cc')
| -rw-r--r-- | ui/base/dragdrop/os_exchange_data_provider_aura.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aura.cc b/ui/base/dragdrop/os_exchange_data_provider_aura.cc index 88f3202..a02ab12 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; |