| 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 f497f759b161724a065fcdfdf6b385d8bf46e437..50354695ed8d925e307a1b35466e7da292fd36ae 100644
|
| --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js
|
| +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js
|
| @@ -30,12 +30,12 @@ Polymer({
|
| */
|
| pageVisibility: Object,
|
|
|
| -<if expr="_google_chrome and not chromeos">
|
| + /* <if expr="_google_chrome and not chromeos"> */
|
| /** @type {MetricsReporting} */
|
| metricsReporting_: Object,
|
|
|
| showRestart_: Boolean,
|
| -</if>
|
| + /* </if> */
|
|
|
| /** @private */
|
| safeBrowsingExtendedReportingEnabled_: Boolean,
|
| @@ -47,19 +47,20 @@ Polymer({
|
| ready: function() {
|
| this.ContentSettingsTypes = settings.ContentSettingsTypes;
|
|
|
| -<if expr="_google_chrome and not chromeos">
|
| + /* <if expr="_google_chrome and not chromeos"> */
|
| var boundSetMetricsReporting = this.setMetricsReporting_.bind(this);
|
| this.addWebUIListener('metrics-reporting-change', boundSetMetricsReporting);
|
|
|
| var browserProxy = settings.PrivacyPageBrowserProxyImpl.getInstance();
|
| browserProxy.getMetricsReporting().then(boundSetMetricsReporting);
|
| -</if>
|
| + /* </if> */
|
|
|
| var boundSetSber = this.setSafeBrowsingExtendedReporting_.bind(this);
|
| - this.addWebUIListener('safe-browsing-extended-reporting-change',
|
| - boundSetSber);
|
| + this.addWebUIListener(
|
| + 'safe-browsing-extended-reporting-change', boundSetSber);
|
| settings.PrivacyPageBrowserProxyImpl.getInstance()
|
| - .getSafeBrowsingExtendedReporting().then(boundSetSber);
|
| + .getSafeBrowsingExtendedReporting()
|
| + .then(boundSetSber);
|
| },
|
|
|
| /** @protected */
|
| @@ -70,13 +71,13 @@ 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">
|
| - settings.PrivacyPageBrowserProxyImpl.getInstance().
|
| - showManageSSLCertificates();
|
| -</if>
|
| + /* </if> */
|
| + /* <if expr="is_win or is_macosx"> */
|
| + settings.PrivacyPageBrowserProxyImpl.getInstance()
|
| + .showManageSSLCertificates();
|
| + /* </if> */
|
| },
|
|
|
| /**
|
| @@ -84,8 +85,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();
|
| },
|
| @@ -111,7 +112,7 @@ Polymer({
|
| 'https://support.google.com/chrome/?p=settings_manage_exceptions');
|
| },
|
|
|
| -<if expr="_google_chrome and not chromeos">
|
| + /* <if expr="_google_chrome and not chromeos"> */
|
| /** @private */
|
| onMetricsReportingCheckboxTap_: function() {
|
| var browserProxy = settings.PrivacyPageBrowserProxyImpl.getInstance();
|
| @@ -128,8 +129,9 @@ Polymer({
|
| // started.
|
| if (metricsReporting.managed) {
|
| this.showRestart_ = false;
|
| - } else if (this.metricsReporting_ &&
|
| - metricsReporting.enabled != this.metricsReporting_.enabled) {
|
| + } else if (
|
| + this.metricsReporting_ &&
|
| + metricsReporting.enabled != this.metricsReporting_.enabled) {
|
| this.showRestart_ = true;
|
| }
|
| this.metricsReporting_ = metricsReporting;
|
| @@ -139,7 +141,7 @@ Polymer({
|
| onRestartTap_: function() {
|
| settings.LifetimeBrowserProxyImpl.getInstance().restart();
|
| },
|
| -</if>
|
| + /* </if> */
|
|
|
| /** @private */
|
| onSafeBrowsingExtendedReportingCheckboxTap_: function() {
|
| @@ -166,11 +168,12 @@ Polymer({
|
| loadTimeData.getString('contentSettings');
|
| },
|
|
|
| -<if expr="chromeos">
|
| + /* <if expr="chromeos"> */
|
| /** @private */
|
| onAdobeFlashStorageClicked_: function() {
|
| - window.open('https://www.macromedia.com/support/' +
|
| + window.open(
|
| + 'https://www.macromedia.com/support/' +
|
| 'documentation/en/flashplayer/help/settings_manager07.html');
|
| },
|
| -</if>
|
| + /* </if> */
|
| });
|
|
|