Settings Router Refactor: Clean up Quick Unlock (and a few misc fixes)

chrome/browser/resources/settings/people_page/sync_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.
 
 (function() {
 
 /**
  * Names of the radio buttons which allow the user to choose his encryption
  * mechanism.
  * @enum {string}
@@ skipping 113 matching lines @@
     },
   },
 
   /** @override */
   attached: function() {
     this.addWebUIListener('page-status-changed',
                           this.handlePageStatusChanged_.bind(this));
     this.addWebUIListener('sync-prefs-changed',
                           this.handleSyncPrefsChanged_.bind(this));
 
-    if (this.isCurrentRouteOnSyncPage_())
+    if (this.currentRoute == settings.Route.SYNC)
       this.onNavigateToPage_();
   },
 
   /** @override */
   detached: function() {
-    if (this.isCurrentRouteOnSyncPage_())
+    if (this.currentRoute == settings.Route.SYNC)
       this.onNavigateAwayFromPage_();
   },
 
-  /**
-   * @private
-   * @return {boolean} Whether the current route shows the sync page.
-   */
-  isCurrentRouteOnSyncPage_: function() {
-    return this.currentRoute &&
-        this.currentRoute.section == 'people' &&
-        this.currentRoute.subpage.length == 1 &&
-        this.currentRoute.subpage[0] == 'sync';
-  },
-
   /** @private */
   currentRouteChanged_: function() {
     if (!this.isAttached)
       return;
 
-    if (this.isCurrentRouteOnSyncPage_())
+    if (this.currentRoute == settings.Route.SYNC)
       this.onNavigateToPage_();
     else
       this.onNavigateAwayFromPage_();
   },
 
   /** @private */
   onNavigateToPage_: function() {
     // The element is not ready for C++ interaction until it is attached.
     assert(this.isAttached);
-    assert(this.isCurrentRouteOnSyncPage_());
+    assert(this.currentRoute == settings.Route.SYNC);
 
     if (this.unloadCallback_)
       return;
 
     // Display loading page until the settings have been retrieved.
     this.selectedPage_ = settings.PageStatus.SPINNER;
 
     this.browserProxy_.didNavigateToSyncPage();
 
     this.unloadCallback_ = this.onNavigateAwayFromPage_.bind(this);
@@ skipping 124 matching lines @@
    * @private
    */
   handlePageStatusChanged_: function(pageStatus) {
     switch (pageStatus) {
       case settings.PageStatus.SPINNER:
       case settings.PageStatus.TIMEOUT:
       case settings.PageStatus.CONFIGURE:
         this.selectedPage_ = pageStatus;
         return;
       case settings.PageStatus.DONE:
-        if (this.isCurrentRouteOnSyncPage_()) {
-          // Event is caught by settings-animated-pages.
-          this.fire('subpage-back');
-        }
+        if (this.currentRoute == settings.Route.SYNC)
+          settings.navigateTo(settings.Route.PEOPLE);
         return;
       case settings.PageStatus.PASSPHRASE_FAILED:
         if (this.selectedPage_ == this.pages.CONFIGURE &&
             this.syncPrefs && this.syncPrefs.passphraseRequired) {
           this.$$('#existingPassphraseInput').invalid = true;
         }
         return;
     }
 
     assertNotReached();
@@ skipping 68 matching lines @@
 
     passphraseInput.invalid = emptyPassphrase;
     passphraseConfirmationInput.invalid =
         !emptyPassphrase && mismatchedPassphrase;
 
     return !emptyPassphrase && !mismatchedPassphrase;
   },
 });
 
 })();