Settings Router Refactor: Kill settings-router.

chrome/browser/resources/settings/settings_page/settings_animated_pages.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-animated-pages' is a container for a page and animated subpages.
  * It provides a set of common behaviors and animations.
  *
  * Example:
  *
- *    <settings-animated-pages current-route="{{currentRoute}}"
- *        section="privacy">
+ *    <settings-animated-pages section="privacy">
  *      <!-- Insert your section controls here -->
  *    </settings-animated-pages>
  */
 Polymer({
   is: 'settings-animated-pages',
 
+  behaviors: [settings.RouteObserverBehavior],
+
   properties: {
     /**
-     * Contains the current route.
-     */
-    currentRoute: {
-      type: Object,
-      notify: true,
-      observer: 'currentRouteChanged_',
-    },
-
-    /**
      * Routes with this section activate this element. For instance, if this
      * property is 'search', and currentRoute.section is also set to 'search',
      * this element will display the subpage in currentRoute.subpage.
      *
-     * The section name must match the name specified in settings_router.js.
+     * The section name must match the name specified in route.js.
      */
     section: {
       type: String,
     },
   },
 
   /** @override */
   created: function() {
     // Observe the light DOM so we know when it's ready.
     this.lightDomObserver_ = Polymer.dom(this).observeNodes(
         this.lightDomChanged_.bind(this));
 
     this.addEventListener('subpage-back', function() {
-      settings.navigateTo(this.currentRoute.parent);

[Dan Beam, 2016/08/05 18:25:19]

all that compilation safety... and we got foiled by null

[michaelpg, 2016/08/05 18:39:28]

how do you even fire this w/out a parent? that sounds like a bug in itself

[tommycli, 2016/08/05 18:54:06]

Done. It could be hypothetically fired when the user is on the BASIC page. But
it shouldn't. I made it an assert.

I'm just going to axe this event in a followup CL.

+      var parent = settings.getCurrentRoute().parent;
+      if (parent)
+        settings.navigateTo(parent);
     }.bind(this));
   },
 
   /**
    * Called initially once the effective children are ready.
    * @private
    */
   lightDomChanged_: function() {
     if (this.lightDomReady_)
       return;
 
     this.lightDomReady_ = true;
     Polymer.dom(this).unobserveNodes(this.lightDomObserver_);
     this.runQueuedRouteChange_();
   },
 
   /**
-   * Calls currentRouteChanged_ with the deferred route change info.
+   * Calls currentRouteChanged with the deferred route change info.
    * @private
    */
   runQueuedRouteChange_: function() {
     if (!this.queuedRouteChange_)
       return;
-    this.async(this.currentRouteChanged_.bind(
+    this.async(this.currentRouteChanged.bind(
         this,
         this.queuedRouteChange_.newRoute,
         this.queuedRouteChange_.oldRoute));
   },
 
-  /** @private */
-  currentRouteChanged_: function(newRoute, oldRoute) {
+  /** @protected */
+  currentRouteChanged: function(newRoute, oldRoute) {
     if (newRoute.section == this.section && newRoute.subpage.length > 0) {
       this.switchToSubpage_(newRoute, oldRoute);
     } else {
       this.$.animatedPages.exitAnimation = 'fade-out-animation';
       this.$.animatedPages.entryAnimation = 'fade-in-animation';
       this.$.animatedPages.selected = 'main';
     }
   },
 
   /**
@@ skipping 41 matching lines @@
     }
 
     this.$.animatedPages.selected = newRoute.subpage.slice(-1)[0];
   },
 
   /**
    * Ensures that the template enclosing the subpage is stamped.
    * @private
    */
   ensureSubpageInstance_: function() {
-    var id = this.currentRoute.subpage.slice(-1)[0];
+    var id = settings.getCurrentRoute().subpage.slice(-1)[0];
     var template = Polymer.dom(this).querySelector(
         'template[name="' + id + '"]');
 
     // Nothing to do if the subpage isn't wrapped in a <template> or the
     // template is already stamped.
     if (!template || template.if)
       return;
 
     // Set the subpage's id for use by neon-animated-pages.
     var subpage = /** @type {{_content: DocumentFragment}} */(template)._content
         .querySelector('settings-subpage');
     if (!subpage.id)
       subpage.id = id;
 
     // Render synchronously so neon-animated-pages can select the subpage.
     template.if = true;
     template.render();
   },
 });