Chromium Code Reviews| 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 8fdf5f7e6e61f2e949d67e6f8acaa3df9fce936d..04f27de40932130a4387ebe90677fe3412ba8680 100644 |
| --- a/chrome/browser/resources/settings/settings_page/main_page_behavior.js |
| +++ b/chrome/browser/resources/settings/settings_page/main_page_behavior.js |
| @@ -116,6 +116,13 @@ var MainPageBehaviorImpl = { |
| promise = this.expandSection_(currentSection); |
| else if (scrollToSection) |
| currentSection.scrollIntoView(); |
| + } else if (settings.Route.ADVANCED.contains(currentRoute) && |
| + // Need to exclude routes that correspond to 'non-sectioned' children of |
| + // ADVANCED, otherwise tryTransitionToSection_ will recurse endlessly. |
| + currentRoute != settings.Route.CLEAR_BROWSER_DATA && |
| + currentRoute != settings.Route.TRIGGERED_RESET_DIALOG && |
| + currentRoute != settings.Route.RESET_DIALOG) { |
|
Dan Beam
2017/03/21 00:29:26
can you do this without calling out specific route
dpapad
2017/03/21 00:54:51
Done.
Dan Beam
2017/03/21 01:54:16
is it OK that children of BASIC are included in th
dpapad
2017/03/21 05:36:36
Yes should be fine, because the 1st part of the co
|
| + promise = this.$$('#advancedPageTemplate').get(); |
| } |
| // When this animation ends, another may be necessary. Call this function |