| Index: chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| diff --git a/chrome/browser/resources/settings/settings_page/main_page_behavior.js b/chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| index 6983546cefafa7429188c946682390539963ffc3..3886816a9110fcb731267fad86474ae00c3b1cf4 100644
|
| --- a/chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| +++ b/chrome/browser/resources/settings/settings_page/main_page_behavior.js
|
| @@ -85,7 +85,11 @@ var MainPageBehaviorImpl = {
|
| oldRouteWasSection || oldRoute == settings.Route.BASIC ||
|
| oldRoute == settings.Route.ABOUT;
|
|
|
| - if (oldRoute && (oldRoute.isSubpage() || newRoute.isSubpage()))
|
| + // TODO(dschuyler): This doesn't set the flag in the case of going to or
|
| + // from the main page. It seems sensible to set the flag in those cases,
|
| + // unfortunately bug 708465 happens. Figure out why that is and then set
|
| + // this flag more broadly.
|
| + if (oldRoute && oldRoute.isSubpage() && newRoute.isSubpage())
|
| this.isSubpageAnimating = true;
|
|
|
| // For previously uncreated pages (including on first load), allow the page
|
|
|