Revert 110905 - Adding parameter to GetStatusLabels to indicate if links are acceptable, as some ...

chrome/browser/sync/sync_ui_util.cc

 // Copyright (c) 2011 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 "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 114 matching lines @@
         global_error_bubble_accept_label->assign(l10n_util::GetStringUTF16(
             IDS_SYNC_SIGN_IN_ERROR_BUBBLE_VIEW_ACCEPT));
       }
       break;
   }
 }
 
 // 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,
-                                   StatusLabelStyle style) {
+string16 GetSyncedStateStatusLabel(ProfileSyncService* service) {
   string16 label;
   string16 user_name(service->GetAuthenticatedUsername());
   if (user_name.empty())
     return label;
 
-  // 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);
-    case WITH_HTML:
-      return l10n_util::GetStringFUTF16(
-          IDS_SYNC_ACCOUNT_SYNCING_TO_USER_WITH_MANAGE_LINK,
-          user_name,
-          ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
-    default:
-      NOTREACHED();
-      return NULL;
-  }
+  return l10n_util::GetStringFUTF16(
+      IDS_SYNC_ACCOUNT_SYNCING_TO_USER,
+      user_name,
+      ASCIIToUTF16(chrome::kSyncGoogleDashboardURL));
 }
 
 void GetStatusForActionableError(
     const browser_sync::SyncProtocolError& error,
     string16* status_label) {
   DCHECK(status_label);
   switch (error.action) {
     case browser_sync::STOP_AND_RESTART_SYNC:
        status_label->assign(
            l10n_util::GetStringUTF16(IDS_SYNC_STOP_AND_RESTART_SYNC));
@@ skipping 13 matching lines @@
       break;
     default:
       NOTREACHED();
   }
 }
 
 // TODO(akalin): Write unit tests for these three functions below.
 
 // status_label and link_label must either be both NULL or both non-NULL.
 MessageType GetStatusInfo(ProfileSyncService* service,
-                          StatusLabelStyle style,
                           string16* status_label,
                           string16* link_label) {
   DCHECK_EQ(status_label == NULL, link_label == NULL);
 
   MessageType result_type(SYNCED);
 
   if (!service) {
     return PRE_SYNCED;
   }
 
@@ skipping 42 matching lines @@
 
     // Now finally passphrase error.
     if (service->IsPassphraseRequired()) {
       if (service->IsPassphraseRequiredForDecryption()) {
         // TODO(lipalani) : Ask tim if this is still needed.
         // NOT first machine.
         // Show a link ("needs attention"), but still indicate the
         // 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, style));
+          status_label->assign(GetSyncedStateStatusLabel(service));
           link_label->assign(
               l10n_util::GetStringUTF16(IDS_SYNC_PASSWORD_SYNC_ATTENTION));
         }
         return SYNC_PROMO;
       }
     }
 
     // There is no error. Display "Last synced..." message.
     if (status_label)
-      status_label->assign(GetSyncedStateStatusLabel(service, style));
+      status_label->assign(GetSyncedStateStatusLabel(service));
     return SYNCED;
   } else {
     // Either show auth error information with a link to re-login, auth in prog,
     // or provide a link to continue with setup.
     result_type = PRE_SYNCED;
     if (service->SetupInProgress()) {
       ProfileSyncService::Status status(service->QueryDetailedSyncStatus());
       const AuthError& auth_error = service->GetAuthError();
       if (status_label) {
         status_label->assign(
@@ skipping 61 matching lines @@
       if (status_label && link_label) {
         status_label->assign(string16());
         link_label->assign(
             l10n_util::GetStringUTF16(IDS_SYNC_CONFIGURE_ENCRYPTION));
       }
       return SYNC_ERROR;
     }
   }
 
   // Fallback to default.
-  return GetStatusInfo(service, WITH_HTML, status_label, link_label);
+  return GetStatusInfo(service, status_label, link_label);
 }
 
 }  // namespace
 
 MessageType GetStatusLabels(ProfileSyncService* service,
-                            StatusLabelStyle style,
                             string16* status_label,
                             string16* link_label) {
   DCHECK(status_label);
   DCHECK(link_label);
-  return sync_ui_util::GetStatusInfo(service, style, status_label, link_label);
+  return sync_ui_util::GetStatusInfo(service, status_label, link_label);
 }
 
 MessageType GetStatusLabelsForNewTabPage(ProfileSyncService* service,
                                          string16* status_label,
                                          string16* link_label) {
   DCHECK(status_label);
   DCHECK(link_label);
   return sync_ui_util::GetStatusInfoForNewTabPage(
       service, status_label, link_label);
 }
@@ skipping 30 matching lines @@
     return;
 
   const AuthError& auth_error = service->GetAuthError();
   if (auth_error.state() != AuthError::NONE) {
     GetStatusLabelsForAuthError(auth_error, *service, NULL, NULL,
         menu_label, bubble_message, bubble_accept_label);
   }
 }
 
 MessageType GetStatus(ProfileSyncService* service) {
-  return sync_ui_util::GetStatusInfo(service, WITH_HTML, NULL, NULL);
+  return sync_ui_util::GetStatusInfo(service, NULL, NULL);
 }
 
 string16 GetSyncMenuLabel(ProfileSyncService* service) {
   MessageType type = GetStatus(service);
 
   if (type == sync_ui_util::SYNCED)
     return l10n_util::GetStringUTF16(IDS_SYNC_MENU_SYNCED_LABEL);
   else if (type == sync_ui_util::SYNC_ERROR)
     return l10n_util::GetStringUTF16(IDS_SYNC_MENU_SYNC_ERROR_LABEL);
   else
@@ skipping 283 matching lines @@
     }
   } else {
     version_modifier = " " + version_modifier;
   }
   return chrome_version.Name() + " " + chrome_version.OSType() + " " +
       chrome_version.Version() + " (" + chrome_version.LastChange() + ")" +
       version_modifier;
 }
 
 }  // namespace sync_ui_util