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

Unified Diff: components/autofill/browser/phone_field.cc

Issue 13973004: Convert string16 -> base::string16 in components/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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: components/autofill/browser/phone_field.cc
diff --git a/components/autofill/browser/phone_field.cc b/components/autofill/browser/phone_field.cc
index e7415bad90273f103dbaa88ea82f93ce3f477745..e3b5a6010115fc716a03137e0534c4ebae4011c4 100644
--- a/components/autofill/browser/phone_field.cc
+++ b/components/autofill/browser/phone_field.cc
@@ -17,8 +17,8 @@
namespace {
// This string includes all area code separators, including NoText.
-string16 GetAreaRegex() {
- string16 area_code = UTF8ToUTF16(autofill::kAreaCodeRe);
+base::string16 GetAreaRegex() {
+ base::string16 area_code = UTF8ToUTF16(autofill::kAreaCodeRe);
area_code.append(ASCIIToUTF16("|")); // Regexp separator.
area_code.append(UTF8ToUTF16(autofill::kAreaCodeNotextRe));
return area_code;
@@ -245,7 +245,7 @@ PhoneField::PhoneField() {
}
// static
-string16 PhoneField::GetRegExp(RegexType regex_id) {
+base::string16 PhoneField::GetRegExp(RegexType regex_id) {
switch (regex_id) {
case REGEX_COUNTRY:
return UTF8ToUTF16(autofill::kCountryCodeRe);
@@ -269,5 +269,5 @@ string16 PhoneField::GetRegExp(RegexType regex_id) {
NOTREACHED();
break;
}
- return string16();
+ return base::string16();
}

Powered by Google App Engine
This is Rietveld 408576698