| Index: chrome/browser/resources/settings/site_settings_page/site_settings_page.js
|
| diff --git a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
|
| index 2640045be759b27e065d6dc5393905de394107ff..ce8e6fda2868519a77d2b70fad65b0f37b82ee32 100644
|
| --- a/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
|
| +++ b/chrome/browser/resources/settings/site_settings_page/site_settings_page.js
|
| @@ -38,7 +38,9 @@ Polymer({
|
| /** @private */
|
| isGuest_: {
|
| type: Boolean,
|
| - value: function() { return loadTimeData.getBoolean('isGuest'); }
|
| + value: function() {
|
| + return loadTimeData.getBoolean('isGuest');
|
| + }
|
| },
|
|
|
| /** @private */
|
| @@ -70,31 +72,26 @@ Polymer({
|
| // element, with additional entries that correspond to subpage trigger
|
| // elements residing in this element's Shadow DOM.
|
| var R = settings.Route;
|
| - [
|
| - [R.SITE_SETTINGS_COOKIES, 'cookies'],
|
| - [R.SITE_SETTINGS_LOCATION, 'location'],
|
| - [R.SITE_SETTINGS_CAMERA, 'camera'],
|
| - [R.SITE_SETTINGS_MICROPHONE, 'microphone'],
|
| - [R.SITE_SETTINGS_NOTIFICATIONS, 'notifications'],
|
| - [R.SITE_SETTINGS_JAVASCRIPT,'javascript'],
|
| - [R.SITE_SETTINGS_FLASH,'flash'],
|
| - [R.SITE_SETTINGS_IMAGES,'images'],
|
| - [R.SITE_SETTINGS_POPUPS,'popups'],
|
| - [R.SITE_SETTINGS_BACKGROUND_SYNC,'background-sync'],
|
| - [R.SITE_SETTINGS_AUTOMATIC_DOWNLOADS,'automatic-downloads'],
|
| - [R.SITE_SETTINGS_UNSANDBOXED_PLUGINS,'unsandboxed-plugins'],
|
| - [R.SITE_SETTINGS_HANDLERS,'protocol-handlers'],
|
| - [R.SITE_SETTINGS_MIDI_DEVICES,'midi-devices'],
|
| - [R.SITE_SETTINGS_ADS,'ads'],
|
| - [R.SITE_SETTINGS_ZOOM_LEVELS,'zoom-levels'],
|
| - [R.SITE_SETTINGS_USB_DEVICES,'usb-devices'],
|
| - [R.SITE_SETTINGS_PDF_DOCUMENTS,'pdf-documents'],
|
| - [R.SITE_SETTINGS_PROTECTED_CONTENT,'protected-content'],
|
| + [[R.SITE_SETTINGS_COOKIES, 'cookies'],
|
| + [R.SITE_SETTINGS_LOCATION, 'location'], [R.SITE_SETTINGS_CAMERA, 'camera'],
|
| + [R.SITE_SETTINGS_MICROPHONE, 'microphone'],
|
| + [R.SITE_SETTINGS_NOTIFICATIONS, 'notifications'],
|
| + [R.SITE_SETTINGS_JAVASCRIPT, 'javascript'],
|
| + [R.SITE_SETTINGS_FLASH, 'flash'], [R.SITE_SETTINGS_IMAGES, 'images'],
|
| + [R.SITE_SETTINGS_POPUPS, 'popups'],
|
| + [R.SITE_SETTINGS_BACKGROUND_SYNC, 'background-sync'],
|
| + [R.SITE_SETTINGS_AUTOMATIC_DOWNLOADS, 'automatic-downloads'],
|
| + [R.SITE_SETTINGS_UNSANDBOXED_PLUGINS, 'unsandboxed-plugins'],
|
| + [R.SITE_SETTINGS_HANDLERS, 'protocol-handlers'],
|
| + [R.SITE_SETTINGS_MIDI_DEVICES, 'midi-devices'],
|
| + [R.SITE_SETTINGS_ADS, 'ads'], [R.SITE_SETTINGS_ZOOM_LEVELS, 'zoom-levels'],
|
| + [R.SITE_SETTINGS_USB_DEVICES, 'usb-devices'],
|
| + [R.SITE_SETTINGS_PDF_DOCUMENTS, 'pdf-documents'],
|
| + [R.SITE_SETTINGS_PROTECTED_CONTENT, 'protected-content'],
|
| ].forEach(function(pair) {
|
| var route = pair[0];
|
| var id = pair[1];
|
| - this.focusConfig.set(
|
| - route.path, '* /deep/ #' + id + ' .subpage-arrow');
|
| + this.focusConfig.set(route.path, '* /deep/ #' + id + ' .subpage-arrow');
|
| }.bind(this));
|
| },
|
|
|
| @@ -122,8 +119,7 @@ Polymer({
|
| 'contentSettingCategoryChanged',
|
| this.updateDefaultValueLabel_.bind(this));
|
| this.addWebUIListener(
|
| - 'setHandlersEnabled',
|
| - this.updateHandlersEnabled_.bind(this));
|
| + 'setHandlersEnabled', this.updateHandlersEnabled_.bind(this));
|
| this.browserProxy.observeProtocolHandlersEnabledState();
|
| },
|
|
|
| @@ -149,8 +145,8 @@ Polymer({
|
| * @private
|
| */
|
| updateDefaultValueLabel_: function(category) {
|
| - this.browserProxy.getDefaultValueForContentType(
|
| - category).then(function(defaultValue) {
|
| + this.browserProxy.getDefaultValueForContentType(category).then(
|
| + function(defaultValue) {
|
| this.set(
|
| 'default_.' + Polymer.CaseMap.dashToCamelCase(category),
|
| defaultValue.setting);
|
| @@ -166,9 +162,8 @@ Polymer({
|
| var category = settings.ContentSettingsTypes.PROTOCOL_HANDLERS;
|
| this.set(
|
| 'default_.' + Polymer.CaseMap.dashToCamelCase(category),
|
| - enabled ?
|
| - settings.PermissionValues.ALLOW :
|
| - settings.PermissionValues.BLOCK);
|
| + enabled ? settings.PermissionValues.ALLOW :
|
| + settings.PermissionValues.BLOCK);
|
| },
|
|
|
| /**
|
| @@ -177,7 +172,7 @@ Polymer({
|
| * @private
|
| */
|
| onTapNavigate_: function(event) {
|
| - var dataSet = /** @type {{route: string}} */(event.currentTarget.dataset);
|
| + var dataSet = /** @type {{route: string}} */ (event.currentTarget.dataset);
|
| settings.navigateTo(settings.Route[dataSet.route]);
|
| },
|
| });
|
|
|