| Index: chrome/browser/resources/settings/privacy_page/privacy_page.js
|
| diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js
|
| index cc7d882208a586a1c36720ffdaf13d6aa7db4a09..8f006968abd274255842e0d33a95034a28d5547a 100644
|
| --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js
|
| +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js
|
| @@ -13,12 +13,7 @@
|
| * Must be kept in sync with the C++ enum of the same name.
|
| * @enum {number}
|
| */
|
| -var NetworkPredictionOptions = {
|
| - ALWAYS: 0,
|
| - WIFI_ONLY: 1,
|
| - NEVER: 2,
|
| - DEFAULT: 1
|
| -};
|
| +var NetworkPredictionOptions = {ALWAYS: 0, WIFI_ONLY: 1, NEVER: 2, DEFAULT: 1};
|
|
|
| Polymer({
|
| is: 'settings-privacy-page',
|
| @@ -52,7 +47,7 @@ Polymer({
|
| }
|
| },
|
|
|
| -// <if expr="_google_chrome and not chromeos">
|
| + // <if expr="_google_chrome and not chromeos">
|
| // TODO(dbeam): make a virtual.* pref namespace and set/get this normally
|
| // (but handled differently in C++).
|
| /** @private {chrome.settingsPrivate.PrefObject} */
|
| @@ -61,18 +56,18 @@ Polymer({
|
| value: function() {
|
| // TODO(dbeam): this is basically only to appease PrefControlBehavior.
|
| // Maybe add a no-validate attribute instead? This makes little sense.
|
| - return /** @type {chrome.settingsPrivate.PrefObject} */({});
|
| + return /** @type {chrome.settingsPrivate.PrefObject} */ ({});
|
| },
|
| },
|
|
|
| showRestart_: Boolean,
|
| -// </if>
|
| + // </if>
|
|
|
| /** @private {chrome.settingsPrivate.PrefObject} */
|
| safeBrowsingExtendedReportingPref_: {
|
| type: Object,
|
| value: function() {
|
| - return /** @type {chrome.settingsPrivate.PrefObject} */({});
|
| + return /** @type {chrome.settingsPrivate.PrefObject} */ ({});
|
| },
|
| },
|
|
|
| @@ -109,11 +104,11 @@ Polymer({
|
| type: Object,
|
| value: function() {
|
| var map = new Map();
|
| -// <if expr="use_nss_certs">
|
| + // <if expr="use_nss_certs">
|
| map.set(
|
| settings.Route.CERTIFICATES.path,
|
| '#manageCertificates .subpage-arrow');
|
| -// </if>
|
| + // </if>
|
| map.set(
|
| settings.Route.SITE_SETTINGS.path,
|
| '#site-settings-subpage-trigger .subpage-arrow');
|
| @@ -132,11 +127,11 @@ Polymer({
|
|
|
| this.browserProxy_ = settings.PrivacyPageBrowserProxyImpl.getInstance();
|
|
|
| -// <if expr="_google_chrome and not chromeos">
|
| + // <if expr="_google_chrome and not chromeos">
|
| var setMetricsReportingPref = this.setMetricsReportingPref_.bind(this);
|
| this.addWebUIListener('metrics-reporting-change', setMetricsReportingPref);
|
| this.browserProxy_.getMetricsReporting().then(setMetricsReportingPref);
|
| -// </if>
|
| + // </if>
|
|
|
| var setSber = this.setSafeBrowsingExtendedReporting_.bind(this);
|
| this.addWebUIListener('safe-browsing-extended-reporting-change', setSber);
|
| @@ -165,7 +160,7 @@ Polymer({
|
| * @private
|
| */
|
| onDoNotTrackChange_: function(event) {
|
| - var target = /** @type {!SettingsToggleButtonElement} */(event.target);
|
| + var target = /** @type {!SettingsToggleButtonElement} */ (event.target);
|
| if (!target.checked) {
|
| // Always allow disabling the pref.
|
| target.sendPrefChange();
|
| @@ -218,12 +213,12 @@ Polymer({
|
|
|
| /** @private */
|
| onManageCertificatesTap_: function() {
|
| -// <if expr="use_nss_certs">
|
| + // <if expr="use_nss_certs">
|
| settings.navigateTo(settings.Route.CERTIFICATES);
|
| -// </if>
|
| -// <if expr="is_win or is_macosx">
|
| + // </if>
|
| + // <if expr="is_win or is_macosx">
|
| this.browserProxy_.showManageSSLCertificates();
|
| -// </if>
|
| + // </if>
|
| },
|
|
|
| /**
|
| @@ -231,8 +226,8 @@ Polymer({
|
| * @private
|
| */
|
| onRemoveAllCookiesFromSite_: function() {
|
| - var node = /** @type {?SiteDataDetailsSubpageElement} */(this.$$(
|
| - 'site-data-details-subpage'));
|
| + var node = /** @type {?SiteDataDetailsSubpageElement} */ (
|
| + this.$$('site-data-details-subpage'));
|
| if (node)
|
| node.removeAll();
|
| },
|
| @@ -259,7 +254,7 @@ Polymer({
|
| this.browserProxy_.setSafeBrowsingExtendedReportingEnabled(enabled);
|
| },
|
|
|
| -// <if expr="_google_chrome and not chromeos">
|
| + // <if expr="_google_chrome and not chromeos">
|
| /** @private */
|
| onMetricsReportingChange_: function() {
|
| var enabled = this.$.metricsReportingControl.checked;
|
| @@ -301,7 +296,7 @@ Polymer({
|
| e.stopPropagation();
|
| settings.LifetimeBrowserProxyImpl.getInstance().restart();
|
| },
|
| -// </if>
|
| + // </if>
|
|
|
| /**
|
| * @param {boolean} enabled Whether reporting is enabled or not.
|
| @@ -329,14 +324,14 @@ Polymer({
|
|
|
| /** @private */
|
| getProtectedContentLabel_: function(value) {
|
| - return value ? this.i18n('siteSettingsProtectedContentEnable')
|
| - : this.i18n('siteSettingsBlocked');
|
| + return value ? this.i18n('siteSettingsProtectedContentEnable') :
|
| + this.i18n('siteSettingsBlocked');
|
| },
|
|
|
| /** @private */
|
| getProtectedContentIdentifiersLabel_: function(value) {
|
| - return value ? this.i18n('siteSettingsProtectedContentEnableIdentifiers')
|
| - : this.i18n('siteSettingsBlocked');
|
| + return value ? this.i18n('siteSettingsProtectedContentEnableIdentifiers') :
|
| + this.i18n('siteSettingsBlocked');
|
| },
|
| });
|
| })();
|
|
|