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

Unified Diff: components/autofill/content/browser/wallet/wallet_address.cc

Issue 112433004: Update uses of UTF conversions in chrome_frame/, chromeos/, components/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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/content/browser/wallet/wallet_address.cc
diff --git a/components/autofill/content/browser/wallet/wallet_address.cc b/components/autofill/content/browser/wallet/wallet_address.cc
index 6d41222764475e4690ed360cf15e0a68f6f53600..000b616fdf3ad32fbbe638a0c3005180bb6e55a3 100644
--- a/components/autofill/content/browser/wallet/wallet_address.cc
+++ b/components/autofill/content/browser/wallet/wallet_address.cc
@@ -253,7 +253,7 @@ base::string16 Address::DisplayName() const {
return recipient_name();
#else
// TODO(estade): improve this stub implementation + l10n.
- return recipient_name() + ASCIIToUTF16(", ") + address_line_1();
+ return recipient_name() + base::ASCIIToUTF16(", ") + address_line_1();
#endif
}
@@ -279,11 +279,11 @@ base::string16 Address::GetInfo(const AutofillType& type,
const std::string& app_locale) const {
if (type.html_type() == HTML_TYPE_COUNTRY_CODE) {
DCHECK(IsStringASCII(country_name_code()));
- return ASCIIToUTF16(country_name_code());
+ return base::ASCIIToUTF16(country_name_code());
} else if (type.html_type() == HTML_TYPE_STREET_ADDRESS) {
base::string16 address = address_line_1();
if (!address_line_2().empty())
- address += ASCIIToUTF16(", ") + address_line_2();
+ address += base::ASCIIToUTF16(", ") + address_line_2();
return address;
}

Powered by Google App Engine
This is Rietveld 408576698