Create a new code path to generate sync strings for the new tab page differen...

chrome/browser/sync/sync_ui_util.cc

 // Copyright (c) 2010 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 "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/number_formatting.h"
 #include "base/i18n/time_formatting.h"
@@ skipping 89 matching lines @@
       DCHECK_EQ(auth_error.state(), AuthError::NONE);
     } else if (service->UIShouldDepictAuthInProgress()) {
       if (status_label) {
         status_label->assign(
           l10n_util::GetStringUTF16(IDS_SYNC_AUTHENTICATING_LABEL));
       }
       result_type = PRE_SYNCED;
     } else if (service->observed_passphrase_required()) {
       if (service->passphrase_required_for_decryption()) {
         // NOT first machine.
-        // Show a link and present as an error ("needs attention").
+        // Show a link and present as an error ("needs attention"),
+        // but still indicate the current synced status.
         if (status_label && link_label) {
-          status_label->assign(string16());
+          status_label->assign(GetSyncedStateStatusLabel(service));
           link_label->assign(
-              l10n_util::GetStringUTF16(IDS_SYNC_CONFIGURE_ENCRYPTION));
+              l10n_util::GetStringUTF16(IDS_SYNC_PASSWORD_SYNC_ATTENTION));
         }
         result_type = SYNC_ERROR;
       } else {
         // First machine.  Show as a promotion.
         if (status_label && link_label) {
-          status_label->assign(
-              l10n_util::GetStringFUTF16(IDS_SYNC_NTP_PASSWORD_PROMO,
-                  l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+          status_label->assign(GetSyncedStateStatusLabel(service));
           link_label->assign(
-              l10n_util::GetStringUTF16(IDS_SYNC_NTP_PASSWORD_ENABLE));
+              l10n_util::GetStringUTF16(IDS_SYNC_NEW_PASSWORD_SYNC));
         }
         result_type = SYNC_PROMO;
       }
     } else if (auth_error.state() != AuthError::NONE) {
       if (status_label && link_label) {
         GetStatusLabelsForAuthError(auth_error, service,
                                     status_label, link_label);
       }
       result_type = SYNC_ERROR;
     }
@@ skipping 34 matching lines @@
       if (status_label) {
         status_label->assign(
             l10n_util::GetStringFUTF16(IDS_SYNC_NOT_SET_UP_INFO,
                 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
       }
     }
   }
   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.
+MessageType GetStatusInfoForNewTabPage(ProfileSyncService* service,
+                                       string16* status_label,
+                                       string16* link_label) {
+  DCHECK(status_label);
+  DCHECK(link_label);
+
+  if (service->HasSyncSetupCompleted() &&
+      service->observed_passphrase_required()) {
+    if (!service->passphrase_required_for_decryption()) {
+      // First machine migrating to passwords.  Show as a promotion.
+      if (status_label && link_label) {
+        status_label->assign(
+            l10n_util::GetStringFUTF16(
+                IDS_SYNC_NTP_PASSWORD_PROMO,
+                l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
+        link_label->assign(
+            l10n_util::GetStringUTF16(IDS_SYNC_NTP_PASSWORD_ENABLE));
+      }
+      return SYNC_PROMO;
+    } else {
+      // NOT first machine.
+      // Show a link and present as an error ("needs attention").
+      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, status_label, link_label);
+}
+
 }  // namespace
 
 // Returns an HTML chunk for a login prompt related to encryption.
 string16 GetLoginMessageForEncryption() {
   std::vector<std::string> subst;
   const base::StringPiece html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_SYNC_ENCRYPTION_LOGIN_HTML));
   subst.push_back(l10n_util::GetStringUTF8(IDS_SYNC_PLEASE_SIGN_IN));
   subst.push_back(
       l10n_util::GetStringFUTF8(IDS_SYNC_LOGIN_FOR_ENCRYPTION,
                                 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME)));
 
   return UTF8ToUTF16(ReplaceStringPlaceholders(html, subst, NULL));
 }
 
 MessageType GetStatusLabels(ProfileSyncService* service,
                             string16* status_label,
                             string16* link_label) {
   DCHECK(status_label);
   DCHECK(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);
+}
+
 MessageType GetStatus(ProfileSyncService* service) {
   return sync_ui_util::GetStatusInfo(service, NULL, NULL);
 }
 
 bool ShouldShowSyncErrorButton(ProfileSyncService* service) {
   return service && !service->IsManaged() && service->HasSyncSetupCompleted() &&
       (GetStatus(service) == sync_ui_util::SYNC_ERROR);
 }
 
 string16 GetSyncMenuLabel(ProfileSyncService* service) {
@@ skipping 183 matching lines @@
 
       DictionaryValue* val = new DictionaryValue;
       val->SetString("stat_name", "Autofill Migration Time");
       val->SetString("stat_value", ConstructTime(info.autofill_migration_time));
       details->Append(val);
     }
   }
 }
 
 }  // namespace sync_ui_util