Adding parameter to GetStatusLabels to indicate if links are acceptable.

chrome/browser/sync/sync_ui_util.cc

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 f9b564a7a09bcdbee08cb4caf9befeedf6be37d0..91f841c732840d7ab4347c65cfdbd4ec0f2849c6 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -131,16 +131,23 @@ void GetStatusLabelsForAuthError(const AuthError& auth_error,
 // 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.
-string16 GetSyncedStateStatusLabel(ProfileSyncService* service) {
+string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
+    bool html_links) {
   string16 label;
   string16 user_name(service->GetAuthenticatedUsername());
   if (user_name.empty())
     return label;
 
-  return l10n_util::GetStringFUTF16(
-      IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
-      user_name,
-      ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
+  // Message may also carry additional advice with an HTML link, if acceptable.
+  if (html_links)

[stuartmorgan, 2011/10/27 11:51:20]

These are multi-line, so need to have braces.

[jimblackler, 2011/10/27 14:53:52]

Done.

+    return l10n_util::GetStringFUTF16(
+        IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK,
+        user_name,
+        ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
+  else
+    return l10n_util::GetStringFUTF16(
+        IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
+        user_name);
 }
 
 void GetStatusForActionableError(
@@ -175,7 +182,8 @@ void GetStatusForActionableError(
 // status_label and link_label must either be both NULL or both non-NULL.
 MessageType GetStatusInfo(ProfileSyncService* service,
                           string16* status_label,
-                          string16* link_label) {
+                          string16* link_label,
+                          bool html_links) {
   DCHECK_EQ(status_label == NULL, link_label == NULL);
 
   MessageType result_type(SYNCED);
@@ -236,7 +244,7 @@ MessageType GetStatusInfo(ProfileSyncService* service,
         // current synced status.  Return SYNC_PROMO so that
         // the configure link will still be shown.
         if (status_label && link_label) {
-          status_label->assign(GetSyncedStateStatusLabel(service));
+          status_label->assign(GetSyncedStateStatusLabel(service, html_links));
           link_label->assign(
               l10n_util::GetStringUTF16(IDS_SYNC_PASSWORD_SYNC_ATTENTION));
         }
@@ -246,7 +254,7 @@ MessageType GetStatusInfo(ProfileSyncService* service,
 
     // There is no error. Display "Last synced..." message.
     if (status_label)
-      status_label->assign(GetSyncedStateStatusLabel(service));
+      status_label->assign(GetSyncedStateStatusLabel(service, html_links));
     return SYNCED;
   } else {
     // Either show auth error information with a link to re-login, auth in prog,
@@ -328,17 +336,19 @@ MessageType GetStatusInfoForNewTabPage(ProfileSyncService* service,
   }
 
   // Fallback to default.
-  return GetStatusInfo(service, status_label, link_label);
+  return GetStatusInfo(service, status_label, link_label, true);
 }
 
 }  // namespace
 
 MessageType GetStatusLabels(ProfileSyncService* service,
                             string16* status_label,
-                            string16* link_label) {
+                            string16* link_label,
+                            bool html_links) {
   DCHECK(status_label);
   DCHECK(link_label);
-  return sync_ui_util::GetStatusInfo(service, status_label, link_label);
+  return sync_ui_util::GetStatusInfo(service, status_label, link_label,
+      html_links);
 }
 
 MessageType GetStatusLabelsForNewTabPage(ProfileSyncService* service,
@@ -389,7 +399,7 @@ void GetStatusLabelsForSyncGlobalError(ProfileSyncService* service,
 }
 
 MessageType GetStatus(ProfileSyncService* service) {
-  return sync_ui_util::GetStatusInfo(service, NULL, NULL);
+  return sync_ui_util::GetStatusInfo(service, NULL, NULL, true);
 }
 
 bool ShouldShowSyncErrorButton(ProfileSyncService* service) {