[MD Settings][People] Updates positions of username and sync status message

chrome/browser/sync/sync_ui_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync/sync_ui_util.h"
 
 #include <stdint.h>
 
 #include <string>
 
@@ skipping 49 matching lines @@
       base::FieldTrialList::FindFullName("ChromeDashboard");
   return group_name == "Enabled";
 }
 
 // Returns the message that should be displayed when the user is authenticated
 // and can connect to the sync server. If the user hasn't yet authenticated, an
 // empty string is returned.
 base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
                                          const SigninManagerBase& signin,
                                          StatusLabelStyle style) {
-  std::string user_display_name = signin.GetAuthenticatedAccountInfo().email;
-
-#if defined(OS_CHROMEOS)
-  if (user_manager::UserManager::IsInitialized()) {
-    // On CrOS user email is sanitized and then passed to the signin manager.
-    // Original email (containing dots) is stored as "display email".
-    user_display_name = user_manager::UserManager::Get()->GetUserDisplayEmail(
-        AccountId::FromUserEmail(user_display_name));
-  }
-#endif  // defined(OS_CHROMEOS)
-
-  base::string16 user_name = base::UTF8ToUTF16(user_display_name);
-
-  if (!user_name.empty()) {
-    if (!service || service->IsManaged()) {
-      // User is signed in, but sync is disabled.
-      return l10n_util::GetStringFUTF16(IDS_SIGNED_IN_WITH_SYNC_DISABLED,
-                                        user_name);
-    } else if (!service->IsSyncRequested()) {
-      // User is signed in, but sync has been stopped.
-      return l10n_util::GetStringFUTF16(IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED,
-                                        user_name);
-    }
-  }
-
-  if (!service || !service->IsSyncActive()) {
+  if (!service || service->IsManaged()) {
+    // User is signed in, but sync is disabled.
+    return l10n_util::GetStringUTF16(IDS_SIGNED_IN_WITH_SYNC_DISABLED);
+  } else if (!service->IsSyncRequested()) {
+    // User is signed in, but sync has been stopped.
+    return l10n_util::GetStringUTF16(IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED);
+  } else if (!service->IsSyncActive()) {
     // User is not signed in, or sync is still initializing.
     return base::string16();
   }
 
-  DCHECK(!user_name.empty());
-
   // Message may also carry additional advice with an HTML link, if acceptable.
   switch (style) {
     case PLAIN_TEXT:
-      return l10n_util::GetStringFUTF16(
-          IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
-          user_name);
+      return l10n_util::GetStringUTF16(IDS_SYNC_ACCOUNT_SYNCING);
     case WITH_HTML:
       if (IsChromeDashboardEnabled()) {
         return l10n_util::GetStringFUTF16(
-            IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK_NEW,
-            user_name,
+            IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK_NEW,
             base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
       }
       return l10n_util::GetStringFUTF16(
-          IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK,
-          user_name,
+          IDS_SYNC_ACCOUNT_SYNCING_WITH_MANAGE_LINK,
           base::ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
     default:
       NOTREACHED();
       return NULL;
   }
 }
 
 void GetStatusForActionableError(
     const syncer::SyncProtocolError& error,
     base::string16* status_label) {
@@ skipping 163 matching lines @@
         if (status_label) {
           GetStatusForActionableError(status.sync_protocol_error,
               status_label);
         }
       } else if (status_label) {
         status_label->assign(l10n_util::GetStringUTF16(IDS_SYNC_SETUP_ERROR));
       }
     } else if (signin.IsAuthenticated()) {
       // 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,
-            base::UTF8ToUTF16(signin.GetAuthenticatedAccountInfo().email));
+        base::string16 label = l10n_util::GetStringUTF16(
+            IDS_SIGNED_IN_WITH_SYNC_SUPPRESSED);
         status_label->assign(label);
         result_type = PRE_SYNCED;
       }
     }
   }
   return result_type;
 }
 
 // Returns the status info for use on the new tab page, where we want slightly
 // different information than in the settings panel.
@@ skipping 29 matching lines @@
     }
   }
 
   // Fallback to default.
   return GetStatusInfo(profile, service, signin, WITH_HTML, status_label,
                        link_label);
 }
 
 }  // namespace
 
+base::string16 GetAuthenticatedUsername(const SigninManagerBase* signin) {
+  std::string user_display_name;
+
+  if (signin->IsAuthenticated()) {
+    user_display_name = signin->GetAuthenticatedAccountInfo().email;
+
+#if defined(OS_CHROMEOS)
+    if (user_manager::UserManager::IsInitialized()) {
+      // On CrOS user email is sanitized and then passed to the signin manager.
+      // Original email (containing dots) is stored as "display email".
+      user_display_name = user_manager::UserManager::Get()->GetUserDisplayEmail(
+          AccountId::FromUserEmail(user_display_name));
+    }
+#endif  // defined(OS_CHROMEOS)
+  }
+
+  return base::UTF8ToUTF16(user_display_name);
+}
+
 MessageType GetStatusLabels(Profile* profile,
                             ProfileSyncService* service,
                             const SigninManagerBase& signin,
                             StatusLabelStyle style,
                             base::string16* status_label,
                             base::string16* link_label) {
   DCHECK(status_label);
   DCHECK(link_label);
   return sync_ui_util::GetStatusInfo(profile, service, signin, style,
                                      status_label, link_label);
@@ skipping 125 matching lines @@
 base::string16 ConstructTime(int64_t time_in_int) {
   base::Time time = base::Time::FromInternalValue(time_in_int);
 
   // If time is null the format function returns a time in 1969.
   if (time.is_null())
     return base::string16();
   return base::TimeFormatFriendlyDateAndTime(time);
 }
 
 }  // namespace sync_ui_util