MD Settings: Restore focus after exiting Content settings sub-subpages.

chrome/browser/resources/settings/site_settings_page/site_settings_page.js

 // Copyright 2015 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.
 
 /**
  * @fileoverview
  * 'settings-site-settings-page' is the settings page containing privacy and
  * security site settings.
  */
 
@@ skipping 31 matching lines @@
     },
 
     /** @private */
     enableSafeBrowsingSubresourceFilter_: {
       type: Boolean,
       value: function() {
         return loadTimeData.getBoolean('enableSafeBrowsingSubresourceFilter');
       }
     },
 
+    /** @type {!Map<string, string>} */
+    focusConfig: Object,
   },
 
   /** @override */
   ready: function() {
     this.ContentSettingsTypes = settings.ContentSettingsTypes;
     this.ALL_SITES = settings.ALL_SITES;
 
     var keys = Object.keys(settings.ContentSettingsTypes);
     for (var i = 0; i < keys.length; ++i) {
       var key = settings.ContentSettingsTypes[keys[i]];
       // Default labels are not applicable to USB and ZOOM.
       if (key == settings.ContentSettingsTypes.USB_DEVICES ||
           key == settings.ContentSettingsTypes.ZOOM_LEVELS)
         continue;
       // Some values are not available (and will DCHECK) in guest mode.
       if (this.isGuest_ &&
           key == settings.ContentSettingsTypes.PROTOCOL_HANDLERS) {
         continue;
       }
       this.updateDefaultValueLabel_(key);
     }
 
     this.addWebUIListener(
         'contentSettingCategoryChanged',
         this.updateDefaultValueLabel_.bind(this));
     this.addWebUIListener(
         'setHandlersEnabled',
         this.updateHandlersEnabled_.bind(this));
     this.browserProxy.observeProtocolHandlersEnabledState();
+
+    var getDeepSelector = function(selector) {
+      return '* /deep/ ' + selector;
+    };

[Dan Beam, 2017/04/12 01:05:26]

'getDeepSelector()'.length > "'* /deep/ ".length  // true

[dpapad, 2017/04/12 02:05:28]

Not applicable anymore.

+
+    this.focusConfig.set(

[Dan Beam, 2017/04/12 01:05:26]

why does this object already exist?

[dpapad, 2017/04/12 02:05:28]

This is now explained in the comment. The |focusConfig| map belongs to the
parent <settings-animated-pages> element. I am passing it down to this element
to add some additional entries to it.

Note that passing it down is not necessary, but I think it would be very odd if
we start referring to DOM element IDs in site_settings_page.html from
privacy_page.html directly. Populating the map with additional entries here
seems more appropriate.

+        settings.Route.SITE_SETTINGS_COOKIES.path,
+        getDeepSelector('#cookies .subpage-arrow'));

[Dan Beam, 2017/04/12 01:05:26]

can we just inline the /deep/ calls?

'* /deep/ #cookies .subpage-arrow'

[dpapad, 2017/04/12 02:05:28]

See latest patch.

+    this.focusConfig.set(
+        settings.Route.SITE_SETTINGS_LOCATION.path,
+        getDeepSelector('#location .subpage-arrow'));
+    this.focusConfig.set(
+        settings.Route.SITE_SETTINGS_CAMERA.path,
+        getDeepSelector('#camera .subpage-arrow'));
+    this.focusConfig.set(
+        settings.Route.SITE_SETTINGS_MICROPHONE.path,
+        getDeepSelector('#microphone .subpage-arrow'));
   },
 
   /**
    * @param {string} setting Value from settings.PermissionValues.
    * @param {string} enabled Non-block label ('feature X not allowed').
    * @param {string} disabled Block label (likely just, 'Blocked').
    * @param {?string} other Tristate value (maybe, 'session only').
    * @private
    */
   defaultSettingLabel_: function(setting, enabled, disabled, other) {
@@ skipping 36 matching lines @@
   /**
    * Navigate to the route specified in the event dataset.
    * @param {!Event} event The tap event.
    * @private
    */
   onTapNavigate_: function(event) {
     var dataSet = /** @type {{route: string}} */(event.currentTarget.dataset);
     settings.navigateTo(settings.Route[dataSet.route]);
   },
 });