| Index: chrome/browser/resources/settings/device_page/device_page.js
|
| diff --git a/chrome/browser/resources/settings/device_page/device_page.js b/chrome/browser/resources/settings/device_page/device_page.js
|
| index 44d61a6ee9a6d60ab28419f8a5c86bac6dede2a3..47f6b670e37417540714ccb52964d9b685f29a7c 100644
|
| --- a/chrome/browser/resources/settings/device_page/device_page.js
|
| +++ b/chrome/browser/resources/settings/device_page/device_page.js
|
| @@ -57,12 +57,18 @@ Polymer({
|
| type: Object,
|
| value: function() {
|
| var map = new Map();
|
| - map.set(settings.Route.POINTERS.path, '#pointersRow .subpage-arrow');
|
| - map.set(settings.Route.KEYBOARD.path, '#keyboardRow .subpage-arrow');
|
| - map.set(settings.Route.STYLUS.path, '#stylusRow .subpage-arrow');
|
| - map.set(settings.Route.DISPLAY.path, '#displayRow .subpage-arrow');
|
| - map.set(settings.Route.STORAGE.path, '#storageRow .subpage-arrow');
|
| - map.set(settings.Route.POWER.path, '#powerRow .subpage-arrow');
|
| + 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');
|
| return map;
|
| },
|
| },
|
| @@ -104,7 +110,7 @@ Polymer({
|
| * @private
|
| */
|
| onPointersTap_: function() {
|
| - settings.navigateTo(settings.Route.POINTERS);
|
| + settings.navigateTo(settings.routes.POINTERS);
|
| },
|
|
|
| /**
|
| @@ -112,7 +118,7 @@ Polymer({
|
| * @private
|
| */
|
| onKeyboardTap_: function() {
|
| - settings.navigateTo(settings.Route.KEYBOARD);
|
| + settings.navigateTo(settings.routes.KEYBOARD);
|
| },
|
|
|
| /**
|
| @@ -120,7 +126,7 @@ Polymer({
|
| * @private
|
| */
|
| onStylusTap_: function() {
|
| - settings.navigateTo(settings.Route.STYLUS);
|
| + settings.navigateTo(settings.routes.STYLUS);
|
| },
|
|
|
| /**
|
| @@ -128,7 +134,7 @@ Polymer({
|
| * @private
|
| */
|
| onDisplayTap_: function() {
|
| - settings.navigateTo(settings.Route.DISPLAY);
|
| + settings.navigateTo(settings.routes.DISPLAY);
|
| },
|
|
|
| /**
|
| @@ -136,7 +142,7 @@ Polymer({
|
| * @private
|
| */
|
| onStorageTap_: function() {
|
| - settings.navigateTo(settings.Route.STORAGE);
|
| + settings.navigateTo(settings.routes.STORAGE);
|
| },
|
|
|
| /**
|
| @@ -144,7 +150,7 @@ Polymer({
|
| * @private
|
| */
|
| onPowerTap_: function() {
|
| - settings.navigateTo(settings.Route.POWER);
|
| + settings.navigateTo(settings.routes.POWER);
|
| },
|
|
|
| /** @protected */
|
| @@ -169,8 +175,8 @@ Polymer({
|
| checkPointerSubpage_: function() {
|
| // Check that the properties have explicitly been set to false.
|
| if (this.hasMouse_ === false && this.hasTouchpad_ === false &&
|
| - settings.getCurrentRoute() == settings.Route.POINTERS) {
|
| - settings.navigateTo(settings.Route.DEVICE);
|
| + settings.getCurrentRoute() == settings.routes.POINTERS) {
|
| + settings.navigateTo(settings.routes.DEVICE);
|
| }
|
| },
|
| });
|
|
|