MD Settings People: Display "On - custom settings" for custom data types

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 b2c35769c2ac17fe49014e8e06d078036f0df4a6..6b7f33b76b86c48d4064aad7826c7a5a24db90a7 100644
--- a/chrome/browser/sync/sync_ui_util.cc
+++ b/chrome/browser/sync/sync_ui_util.cc
@@ -33,6 +33,7 @@
 #include "components/signin/core/browser/signin_manager_base.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/sync/base/model_type.h"
+#include "components/sync/base/sync_prefs.h"
 #include "components/sync/engine/cycle/sync_cycle_snapshot.h"
 #include "components/sync/protocol/proto_enum_conversions.h"
 #include "components/sync/protocol/sync_protocol_error.h"
@@ -66,7 +67,8 @@ bool IsChromeDashboardEnabled() {
 // empty string is returned.
 base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
                                          const SigninManagerBase& signin,
-                                         StatusLabelStyle style) {
+                                         StatusLabelStyle style,
+                                         bool all_data_types_synced) {

[Nicolas Zea, 2017/01/18 01:15:45]

nit: for consistency sake, maybe rename to sync_everything (here and elsewhere)?

[tommycli, 2017/01/18 16:36:09]

Done.

   if (!service || service->IsManaged()) {
     // User is signed in, but sync is disabled.
     return l10n_util::GetStringUTF16(IDS_SIGNED_IN_WITH_SYNC_DISABLED);
@@ -81,7 +83,9 @@ base::string16 GetSyncedStateStatusLabel(ProfileSyncService* service,
   // Message may also carry additional advice with an HTML link, if acceptable.
   switch (style) {
     case PLAIN_TEXT:
-      return l10n_util::GetStringUTF16(IDS_SYNC_ACCOUNT_SYNCING);
+      return l10n_util::GetStringUTF16(
+          all_data_types_synced ? IDS_SYNC_ACCOUNT_SYNCING
+                                : IDS_SYNC_ACCOUNT_SYNCING_CUSTOM_DATA_TYPES);
     case WITH_HTML:
       if (IsChromeDashboardEnabled()) {
         return l10n_util::GetStringFUTF16(
@@ -228,6 +232,10 @@ MessageType GetStatusInfo(Profile* profile,
       return PRE_SYNCED;
     }
 
+    PrefService* pref_service = profile->GetPrefs();
+    syncer::SyncPrefs sync_prefs(pref_service);
+    bool all_data_types_synced = sync_prefs.HasKeepEverythingSynced();
+
     // Check for sync errors if the sync service is enabled.
     if (service) {
       // Since there is no auth in progress, check for an auth error first.
@@ -270,17 +278,18 @@ MessageType GetStatusInfo(Profile* profile,
       if (!service->IsSyncRequested() &&
           status.sync_protocol_error.error_type == syncer::NOT_MY_BIRTHDAY) {
         if (status_label) {
-          status_label->assign(GetSyncedStateStatusLabel(service,
-                                                         signin,
-                                                         style));
+          status_label->assign(GetSyncedStateStatusLabel(
+              service, signin, style, all_data_types_synced));
         }
         return PRE_SYNCED;
       }
     }
 
     // There is no error. Display "Last synced..." message.
-    if (status_label)
-      status_label->assign(GetSyncedStateStatusLabel(service, signin, style));
+    if (status_label) {
+      status_label->assign(GetSyncedStateStatusLabel(service, signin, style,
+                                                     all_data_types_synced));
+    }
     return SYNCED;
   } else {
     // Either show auth error information with a link to re-login, auth in prog,