Settings: Fix Clear Browsing Data dialog scrolling to Privacy page

chrome/browser/resources/settings/route.js

 // Copyright 2016 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.
 
 cr.define('settings', function() {
   /**
    * Class for navigable routes. May only be instantiated within this file.
    * @constructor
    * @param {string} path
    * @private
@@ skipping 56 matching lines @@
           return true;
       }
       return false;
     },
 
     /**
      * Returns true if this route is a subpage of a section.
      * @return {boolean}
      */
     isSubpage: function() {
-      return !!this.parent && this.parent.section == this.section;
+      return !!this.parent && !!this.section &&
+          this.parent.section == this.section;
     },
   };
 
   // Abbreviated variable for easier definitions.
   var r = Route;
 
   // Root pages.
   r.BASIC = new Route('/');
   r.ADVANCED = new Route('/advanced');
   r.ABOUT = new Route('/help');
@@ skipping 29 matching lines @@
   r.POINTERS = r.DEVICE.createChild('/pointer-overlay');
   r.KEYBOARD = r.DEVICE.createChild('/keyboard-overlay');
   r.DISPLAY = r.DEVICE.createChild('/display');
   r.NOTES = r.DEVICE.createChild('/note');
 </if>
 
   r.PRIVACY = r.ADVANCED.createSection('/privacy', 'privacy');
   r.CERTIFICATES = r.PRIVACY.createChild('/certificates');
 
   // CLEAR_BROWSER_DATA is the only navigable dialog route. It's the only child
   // of a section that's not a subpage. Don't add any more routes like these.

[michaelpg, 2016/08/16 23:28:02]

Update comment?

[tommycli, 2016/08/16 23:50:08]

Done.

   // If more navigable dialogs are needed, add explicit support in Route.
-  r.CLEAR_BROWSER_DATA = r.PRIVACY.createChild('/clearBrowserData');
-  r.CLEAR_BROWSER_DATA.isSubpage = function() { return false; };
+  r.CLEAR_BROWSER_DATA = r.ADVANCED.createChild('/clearBrowserData');
 
   r.SITE_SETTINGS = r.PRIVACY.createChild('/siteSettings');
   r.SITE_SETTINGS_ALL = r.SITE_SETTINGS.createChild('all');
   r.SITE_SETTINGS_ALL_DETAILS = r.SITE_SETTINGS_ALL.createChild('details');
 
   r.SITE_SETTINGS_HANDLERS = r.SITE_SETTINGS.createChild('handlers');
 
   // TODO(tommycli): Find a way to refactor these repetitive category routes.
   r.SITE_SETTINGS_AUTOMATIC_DOWNLOADS =
       r.SITE_SETTINGS.createChild('automaticDownloads');
@@ skipping 208 matching lines @@
   return {
     Route: Route,
     RouteObserverBehavior: RouteObserverBehavior,
     getRouteForPath: getRouteForPath,
     initializeRouteFromUrl: initializeRouteFromUrl,
     getCurrentRoute: getCurrentRoute,
     getQueryParameters: getQueryParameters,
     navigateTo: navigateTo,
   };
 });