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

Unified Diff: chrome/browser/sync/sync_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/sync/sync_ui_util.cc
diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc
index d35bfd47207763268bcede26a35627dd4794b343..46f70726eb5464a3965fcb9fb5e21f9f50c78f87 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -47,7 +47,8 @@ namespace {
base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
const SigninManagerBase& signin,
StatusLabelStyle style) {
- base::string16 user_name = UTF8ToUTF16(signin.GetAuthenticatedUsername());
+ base::string16 user_name =
+ base::UTF8ToUTF16(signin.GetAuthenticatedUsername());
if (!user_name.empty()) {
if (!service || service->IsManaged()) {
@@ -78,7 +79,7 @@ base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
return l10n_util::GetStringFUTF16(
IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK,
user_name,
- ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
+ base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
default:
NOTREACHED();
return NULL;
@@ -253,8 +254,8 @@ MessageType GetStatusInfo(ProfileSyncService* service,
// The user is signed in, but sync has been stopped.
if (status_label) {
base::string16 label = l10n_util::GetStringFUTF16(
- IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED,
- UTF8ToUTF16(signin.GetAuthenticatedUsername()));
+ IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED,
+ base::UTF8ToUTF16(signin.GetAuthenticatedUsername()));
status_label->assign(label);
result_type = PRE_SYNCED;
}
« no previous file with comments | « chrome/browser/sync/profile_sync_service_typed_url_unittest.cc ('k') | chrome/browser/sync/sync_ui_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698