[MD Settings][Sync Settings] Updates sync status messages

chrome/browser/resources/settings/people_page/people_page.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview
  * 'settings-people-page' is the settings page containing sign-in settings.
  */
 Polymer({
   is: 'settings-people-page',
@@ skipping 239 matching lines @@
     this.syncBrowserProxy_.signOut(deleteProfile);
 
     this.$.disconnectDialog.close();
   },
 
   /** @private */
   onSyncTap_: function() {
     assert(this.syncStatus.signedIn);
     assert(this.syncStatus.syncSystemEnabled);
 
-    if (this.syncStatus.managed)
+    if (!this.isSyncStatusActionable_(this.syncStatus))
       return;
 
-    settings.navigateTo(settings.Route.SYNC);
+    switch (this.syncStatus.statusAction) {
+      case settings.StatusAction.REAUTHENTICATE:
+<if expr="chromeos">
+        this.syncBrowserProxy_.attemptUserExit();
+</if>
+<if expr="not chromeos">
+        if (this.syncStatus.domain)
+          settings.navigateTo(settings.Route.SIGN_OUT);
+        else {
+          // Silently sign the user out without deleting their profile and
+          // prompt them to sign back in.
+          this.syncBrowserProxy_.signOut(false);
+          this.syncBrowserProxy_.startSignIn();
+        }
+</if>
+        break;
+      case settings.StatusAction.UPGRADE_CLIENT:
+        settings.navigateTo(settings.Route.ABOUT);
+        break;
+      case settings.StatusAction.ENTER_PASSPHRASE:
+      case settings.StatusAction.NO_ACTION:
+      default:
+        settings.navigateTo(settings.Route.SYNC);
+    }

[tommycli, 2016/10/28 21:21:09]

I assume all these behaviors are desired / specified by the interaction
designer?

[Moe, 2016/11/01 19:44:01]

I believe so. I need to double check the 'upgrade' action though.

   },
 
 <if expr="chromeos">
   /** @private */
   onConfigureLockTap_: function() {
     settings.navigateTo(settings.Route.LOCK_SCREEN);
   },
 
   /** @private */
   onEasyUnlockSetupTap_: function() {
@@ skipping 56 matching lines @@
    * @return {boolean}
    */
   isAdvancedSyncSettingsVisible_: function(syncStatus) {
     return !!syncStatus && !!syncStatus.signedIn &&
         !!syncStatus.syncSystemEnabled;
   },
 
   /**
    * @private
    * @param {?settings.SyncStatus} syncStatus
+   * @return {boolean} Whether an action can be taken with the sync status. sync
+   *     status is actionable if sync is not managed and if there is a sync
+   *     error, there is an action associated with it.
+   */
+  isSyncStatusActionable_: function(syncStatus) {
+    return !!syncStatus && !syncStatus.managed && (!syncStatus.hasError ||
+        syncStatus.statusAction != settings.StatusAction.NO_ACTION);
+  },
+
+  /**
+   * @private
+   * @param {?settings.SyncStatus} syncStatus
    * @return {string}
    */
   getSyncIcon_: function(syncStatus) {
     if (!syncStatus)
       return '';
+
+    var syncIcon = 'settings:sync';
+
     if (syncStatus.hasError)
-      return 'settings:sync-problem';
+      syncIcon = 'settings:sync-problem';
+
+    // Override the icon to the disabled icon if sync is managed.
     if (syncStatus.managed)
-      return 'settings:sync-disabled';
+      syncIcon = 'settings:sync-disabled';
 
-    return 'settings:sync';
+    return syncIcon;
   },
 
   /**
+   * @private
+   * @param {?settings.SyncStatus} syncStatus
+   * @return {string} The class name for the sync status text.
+   */
+  getSyncStatusTextClass_: function(syncStatus) {
+    return (!!syncStatus && syncStatus.hasError) ? 'sync-error' : '';
+  },
+
+  /**
    * @param {string} iconUrl
    * @return {string} A CSS imageset for multiple scale factors.
    * @private
    */
   getIconImageset_: function(iconUrl) {
     return cr.icon.getImage(iconUrl);
   },
 
   /**
    * @return {boolean} Whether to show the "Sign in to Chrome" button.
    * @private
    */
   showSignin_: function(syncStatus) {
     return !!syncStatus.signinAllowed && !syncStatus.signedIn;
   },
 });