diff options
author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
---|---|---|
committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-03 20:11:26 +0000 |
commit | fcf75d4016c7a2dcad1d2415009eff1e0eef4468 (patch) | |
tree | d41b14e6526a822b66d692f60dc8f648a2afb3cd /content/renderer/android/address_detector.cc | |
parent | 426d1c945bcb1a8479d92a7dd023c34cbbc7a261 (diff) | |
download | chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.zip chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.gz chromium_src-fcf75d4016c7a2dcad1d2415009eff1e0eef4468.tar.bz2 |
Convert string16 to base::string16 in content.
BUG=
Review URL: https://codereview.chromium.org/102593002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/android/address_detector.cc')
-rw-r--r-- | content/renderer/android/address_detector.cc | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/content/renderer/android/address_detector.cc b/content/renderer/android/address_detector.cc index afc7ab6..fdc70b1 100644 --- a/content/renderer/android/address_detector.cc +++ b/content/renderer/android/address_detector.cc @@ -36,20 +36,23 @@ size_t AddressDetector::GetMaximumContentLength() { return kMaxAddressLength; } -std::string AddressDetector::GetContentText(const string16& text) { +std::string AddressDetector::GetContentText(const base::string16& text) { // Get the address and replace unicode bullets with commas. - string16 address_16 = CollapseWhitespace(text, false); + base::string16 address_16 = CollapseWhitespace(text, false); std::replace(address_16.begin(), address_16.end(), static_cast<char16>(0x2022), static_cast<char16>(',')); return UTF16ToUTF8(address_16); } -bool AddressDetector::FindContent(const string16::const_iterator& begin, - const string16::const_iterator& end, size_t* start_pos, size_t* end_pos, +bool AddressDetector::FindContent( + const base::string16::const_iterator& begin, + const base::string16::const_iterator& end, + size_t* start_pos, + size_t* end_pos, std::string* content_text) { if (address_parser::FindAddress(begin, end, start_pos, end_pos)) { content_text->assign( - GetContentText(string16(begin + *start_pos, begin + *end_pos))); + GetContentText(base::string16(begin + *start_pos, begin + *end_pos))); return true; } return false; |