Settings: Implement sub-subpages, and clean up some animations.

chrome/browser/resources/settings/settings_page/settings_animated_pages.js

Index: chrome/browser/resources/settings/settings_page/settings_animated_pages.js
diff --git a/chrome/browser/resources/settings/settings_page/settings_animated_pages.js b/chrome/browser/resources/settings/settings_page/settings_animated_pages.js
index 634a329a9ee80f7eec79f778a07a2b8f0bfc64e1..bf991e039defb012c318f0588f6b7cc64f8bacc1 100644
--- a/chrome/browser/resources/settings/settings_page/settings_animated_pages.js
+++ b/chrome/browser/resources/settings/settings_page/settings_animated_pages.js
@@ -21,24 +21,6 @@ Polymer({
   is: 'cr-settings-animated-pages',
 
   properties: {
-    /**
-     * Corresponds to a page id.
-     */
-    selectedPage: {
-      type: String,
-      value: 'main',
-    },
-
-    entryAnimation: {
-      type: String,
-      value: 'next-page-enter-animation',
-    },
-
-    exitAnimation: {
-      type: String,
-      value: 'next-page-exit-animation',
-    },
-
     inSubpage: {
       type: Boolean,
       notify: true,
@@ -50,19 +32,39 @@ Polymer({
     this.history_ = ['main'];
   },
 
+  /** @private */
   inSubpageChanged_: function() {
     this.classList.toggle('in-subpage', this.inSubpage);
   },
 
   navigateTo: function(page) {
+    if (this.inSubpage) {
+      this.$.animatedPages.exitAnimation = 'slide-left-animation';
+      this.$.animatedPages.entryAnimation = 'slide-from-right-animation';
+    } else {
+      this.$.animatedPages.exitAnimation = 'fade-out-animation';
+      this.$.animatedPages.entryAnimation = 'fade-in-animation';
+    }
+
     this.history_.push(page);
     this.inSubpage = true;
-    this.selectedPage = page;
+
+    this.$.animatedPages.selected = page;
   },
 
   back: function() {
     this.history_.pop();
     this.inSubpage = this.history_.length > 1;
-    this.selectedPage = this.history_.slice(-1)[0];
+    var page = this.history_.slice(-1)[0];

[Dan Beam, 2015/08/12 21:38:04]

why can't this just be inlined?

[tommycli, 2015/08/12 22:11:57]

Done.

+
+    if (this.inSubpage) {
+      this.$.animatedPages.exitAnimation = 'slide-right-animation';
+      this.$.animatedPages.entryAnimation = 'slide-from-left-animation';
+    } else {
+      this.$.animatedPages.exitAnimation = 'fade-out-animation';
+      this.$.animatedPages.entryAnimation = 'fade-in-animation';
+    }
+
+    this.$.animatedPages.selected = page;
   },
 });