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

Unified Diff: chrome/browser/signin/signin_ui_util.cc

Issue 120983002: Update some uses of UTF conversions in chrome/browser 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: chrome/browser/signin/signin_ui_util.cc
diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc
index 818bd4cb1cfa8728afe5e41f29eedbd77d3b216f..314f67b1010fc778778322b38a26d16d70363aa0 100644
--- a/chrome/browser/signin/signin_ui_util.cc
+++ b/chrome/browser/signin/signin_ui_util.cc
@@ -75,9 +75,8 @@ base::string16 GetSigninMenuLabel(Profile* profile) {
if (signin_manager)
username = signin_manager->GetAuthenticatedUsername();
if (!username.empty() && !signin_manager->AuthInProgress()) {
- base::string16 elided_username = gfx::ElideEmail(UTF8ToUTF16(username),
- gfx::FontList(),
- kUsernameMaxWidth);
+ base::string16 elided_username = gfx::ElideEmail(
+ base::UTF8ToUTF16(username), gfx::FontList(), kUsernameMaxWidth);
return l10n_util::GetStringFUTF16(IDS_SYNC_MENU_SYNCED_LABEL,
elided_username);
}
@@ -93,7 +92,7 @@ void GetStatusLabelsForAuthError(Profile* profile,
base::string16* status_label,
base::string16* link_label) {
base::string16 username =
- UTF8ToUTF16(signin_manager.GetAuthenticatedUsername());
+ base::UTF8ToUTF16(signin_manager.GetAuthenticatedUsername());
base::string16 product_name = l10n_util::GetStringUTF16(IDS_PRODUCT_NAME);
if (link_label)
link_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_RELOGIN_LINK_LABEL));

Powered by Google App Engine
This is Rietveld 408576698