Settings: Fix focus restoration after subpage exit.

The code stopped working when paper-icon-button-light was updated to its
latest version, which changed the structure of the DOM.

Bug: 860854
Cq-Include-Trybots: luci.chromium.try:closure_compilation
Change-Id: I0c7189752a5ae47eab0024e3e81775a5f93ee7b6
Reviewed-on: https://chromium-review.googlesource.com/1128463Reviewed-by: Hector Carmona <hcarmona@chromium.org>
Commit-Queue: Demetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#573531}

chrome/browser/resources/settings/a11y_page/a11y_page.js

@@ -37,7 +37,7 @@ Polymer({
         if (settings.routes.MANAGE_ACCESSIBILITY) {
           map.set(
               settings.routes.MANAGE_ACCESSIBILITY.path,
-              '#subpage-trigger .subpage-arrow');
+              '#subpage-trigger .subpage-arrow button');
         }
         // </if>
         return map;

chrome/browser/resources/settings/android_apps_page/android_apps_page.js

@@ -31,7 +31,7 @@ Polymer({
         if (settings.routes.ANDROID_APPS_DETAILS) {
           map.set(
               settings.routes.ANDROID_APPS_DETAILS.path,
-              '#android-apps .subpage-arrow');
+              '#android-apps .subpage-arrow button');
         }
         return map;
       },

chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js

@@ -74,7 +74,7 @@ Polymer({
         if (settings.routes.BLUETOOTH_DEVICES) {
           map.set(
               settings.routes.BLUETOOTH_DEVICES.path,
-              '#bluetoothDevices .subpage-arrow');
+              '#bluetoothDevices .subpage-arrow button');
         }
         return map;
       },

chrome/browser/resources/settings/crostini_page/crostini_page.js

@@ -29,7 +29,7 @@ Polymer({
         if (settings.routes.CROSTINI_DETAILS) {
           map.set(
               settings.routes.CROSTINI_DETAILS.path,
-              '#crostini .subpage-arrow');
+              '#crostini .subpage-arrow button');
         }
         return map;
       },

chrome/browser/resources/settings/date_time_page/date_time_page.js

@@ -41,7 +41,7 @@ Polymer({
         if (settings.routes.DATETIME_TIMEZONE_SUBPAGE)
           map.set(
               settings.routes.DATETIME_TIMEZONE_SUBPAGE.path,
-              '#timeZoneSettingsTrigger .subpage-arrow');
+              '#timeZoneSettingsTrigger .subpage-arrow button');
         return map;
       },
     },

chrome/browser/resources/settings/device_page/device_page.js

@@ -59,18 +59,34 @@ Polymer({
       type: Object,
       value: function() {
         const map = new Map();
-        if (settings.routes.POINTERS)
-          map.set(settings.routes.POINTERS.path, '#pointersRow .subpage-arrow');
-        if (settings.routes.KEYBOARD)
-          map.set(settings.routes.KEYBOARD.path, '#keyboardRow .subpage-arrow');
-        if (settings.routes.STYLUS)
-          map.set(settings.routes.STYLUS.path, '#stylusRow .subpage-arrow');
-        if (settings.routes.DISPLAY)
-          map.set(settings.routes.DISPLAY.path, '#displayRow .subpage-arrow');
-        if (settings.routes.STORAGE)
-          map.set(settings.routes.STORAGE.path, '#storageRow .subpage-arrow');
-        if (settings.routes.POWER)
-          map.set(settings.routes.POWER.path, '#powerRow .subpage-arrow');
+        if (settings.routes.POINTERS) {
+          map.set(
+              settings.routes.POINTERS.path,
+              '#pointersRow .subpage-arrow button');
+        }
+        if (settings.routes.KEYBOARD) {
+          map.set(
+              settings.routes.KEYBOARD.path,
+              '#keyboardRow .subpage-arrow button');
+        }
+        if (settings.routes.STYLUS) {
+          map.set(
+              settings.routes.STYLUS.path, '#stylusRow .subpage-arrow button');
+        }
+        if (settings.routes.DISPLAY) {
+          map.set(
+              settings.routes.DISPLAY.path,
+              '#displayRow .subpage-arrow button');
+        }
+        if (settings.routes.STORAGE) {
+          map.set(
+              settings.routes.STORAGE.path,
+              '#storageRow .subpage-arrow button');
+        }
+        if (settings.routes.POWER) {
+          map.set(
+              settings.routes.POWER.path, '#powerRow .subpage-arrow button');
+        }
         return map;
       },
     },

chrome/browser/resources/settings/downloads_page/downloads_page.js

@@ -62,7 +62,9 @@ Polymer({
         const map = new Map();
         // <if expr="chromeos">
         if (settings.routes.SMB_SHARES) {
-          map.set(settings.routes.SMB_SHARES.path, '#smbShares .subpage-arrow');
+          map.set(
+              settings.routes.SMB_SHARES.path,
+              '#smbShares .subpage-arrow button');
         }
         // </if>
         return map;

chrome/browser/resources/settings/internet_page/internet_page.js

@@ -245,7 +245,8 @@ Polymer({
       // entire list for now.
       selector = '* /deep/ #networkList';
     } else if (this.detailType_) {
-      selector = '* /deep/ #' + this.detailType_ + ' /deep/ .subpage-arrow';
+      selector =
+          '* /deep/ #' + this.detailType_ + ' /deep/ .subpage-arrow button';
     }
     if (selector && this.querySelector(selector))
       this.focusConfig_.set(oldRoute.path, selector);

chrome/browser/resources/settings/languages_page/languages_page.js

@@ -101,14 +101,14 @@ Polymer({
         if (settings.routes.EDIT_DICTIONARY) {
           map.set(
               settings.routes.EDIT_DICTIONARY.path,
-              '#spellCheckCollapse .subpage-arrow');
+              '#spellCheckCollapse .subpage-arrow button');
         }
         // </if>
         // <if expr="chromeos">
         if (settings.routes.INPUT_METHODS) {
           map.set(
               settings.routes.INPUT_METHODS.path,
-              '#inputMethodsCollapse .subpage-arrow');
+              '#inputMethodsCollapse .subpage-arrow button');
         }
         // </if>
         return map;

chrome/browser/resources/settings/passwords_and_forms_page/passwords_and_forms_page.js

@@ -25,7 +25,7 @@ Polymer({
     if (settings.routes.MANAGE_PASSWORDS) {
       this.focusConfig_.set(
           settings.routes.MANAGE_PASSWORDS.path,
-          '#passwordManagerButton .subpage-arrow');
+          '#passwordManagerButton .subpage-arrow button');
     }
   },
 

chrome/browser/resources/settings/people_page/people_page.js

@@ -136,8 +136,10 @@ Polymer({
       type: Object,
       value: function() {
         const map = new Map();
-        if (settings.routes.SYNC)
-          map.set(settings.routes.SYNC.path, '#sync-status .subpage-arrow');
+        if (settings.routes.SYNC) {
+          map.set(
+              settings.routes.SYNC.path, '#sync-status .subpage-arrow button');
+        }
         if (settings.routes.MANAGE_PASSWORDS) {
           map.set(
               settings.routes.MANAGE_PASSWORDS.path, '#passwordManagerButton');
@@ -149,24 +151,24 @@ Polymer({
         if (settings.routes.MANAGE_PROFILE) {
           map.set(
               settings.routes.MANAGE_PROFILE.path,
-              '#picture-subpage-trigger .subpage-arrow');
+              '#picture-subpage-trigger .subpage-arrow button');
         }
         // </if>
         // <if expr="chromeos">
         if (settings.routes.CHANGE_PICTURE) {
           map.set(
               settings.routes.CHANGE_PICTURE.path,
-              '#picture-subpage-trigger .subpage-arrow');
+              '#picture-subpage-trigger .subpage-arrow button');
         }
         if (settings.routes.LOCK_SCREEN) {
           map.set(
               settings.routes.LOCK_SCREEN.path,
-              '#lock-screen-subpage-trigger .subpage-arrow');
+              '#lock-screen-subpage-trigger .subpage-arrow button');
         }
         if (settings.routes.ACCOUNTS) {
           map.set(
               settings.routes.ACCOUNTS.path,
-              '#manage-other-people-subpage-trigger .subpage-arrow');
+              '#manage-other-people-subpage-trigger .subpage-arrow button');
         }
         // </if>
         return map;

chrome/browser/resources/settings/printing_page/printing_page.js

@@ -24,13 +24,13 @@ Polymer({
         if (settings.routes.CLOUD_PRINTERS) {
           map.set(
               settings.routes.CLOUD_PRINTERS.path,
-              '#cloudPrinters .subpage-arrow');
+              '#cloudPrinters .subpage-arrow button');
         }
         // <if expr="chromeos">
         if (settings.routes.CUPS_PRINTERS) {
           map.set(
               settings.routes.CUPS_PRINTERS.path,
-              '#cupsPrinters .subpage-arrow');
+              '#cupsPrinters .subpage-arrow button');
         }
         // </if>
         return map;

chrome/browser/resources/settings/privacy_page/privacy_page.js

@@ -100,13 +100,13 @@ Polymer({
         if (settings.routes.CERTIFICATES) {
           map.set(
               settings.routes.CERTIFICATES.path,
-              '#manageCertificates .subpage-arrow');
+              '#manageCertificates .subpage-arrow button');
         }
         // </if>
         if (settings.routes.SITE_SETTINGS) {
           map.set(
               settings.routes.SITE_SETTINGS.path,
-              '#site-settings-subpage-trigger .subpage-arrow');
+              '#site-settings-subpage-trigger .subpage-arrow button');
         }
         return map;
       },

chrome/browser/resources/settings/search_page/search_page.js

@@ -84,13 +84,13 @@ Polymer({
     if (settings.routes.SEARCH_ENGINES) {
       this.focusConfig_.set(
           settings.routes.SEARCH_ENGINES.path,
-          '#engines-subpage-trigger .subpage-arrow');
+          '#engines-subpage-trigger .subpage-arrow button');
     }
     // <if expr="chromeos">
     if (settings.routes.GOOGLE_ASSISTANT) {
       this.focusConfig_.set(
           settings.routes.GOOGLE_ASSISTANT.path,
-          '#assistant-subpage-trigger .subpage-arrow');
+          '#assistant-subpage-trigger .subpage-arrow button');
     }
     // </if>
   },