| 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 34ce3f0c86c37dbb31b2af2096afae3a7f066960..2d6dece8e7f81f043bdb8cce2df144f8e8152832 100644
|
| --- a/chrome/browser/resources/settings/settings_page/settings_animated_pages.js
|
| +++ b/chrome/browser/resources/settings/settings_page/settings_animated_pages.js
|
| @@ -108,10 +108,21 @@ Polymer({
|
| }
|
| }
|
|
|
| - if (newRouteIsSubpage && newRoute.section == this.section)
|
| + if (newRouteIsSubpage && newRoute.section == this.section) {
|
| + if (!oldRouteIsSubpage) {
|
| + // Set the height the expand animation should start at before beginning
|
| + // the transition to the new sub-page.
|
| + // TODO(michaelpg): Remove MainPageBehavior's dependency on this height
|
| + // being set.
|
| + this.style.height = this.clientHeight + 'px';
|
| + this.async(function() {
|
| + this.style.height = '';
|
| + });
|
| + }
|
| this.$.animatedPages.selected = newRoute.subpage.slice(-1)[0];
|
| - else
|
| + } else {
|
| this.$.animatedPages.selected = 'main';
|
| + }
|
| },
|
|
|
| /**
|
|
|