MD Settings: change how tap is handled on custom toggle rows

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * 'settings-privacy-page' is the settings page containing privacy and
  * security settings.
  */
 Polymer({
@@ skipping 13 matching lines @@
       notify: true,
     },
 
     /**
      * Dictionary defining page visibility.
      * @type {!PrivacyPageVisibility}
      */
     pageVisibility: Object,
 
 // <if expr="_google_chrome and not chromeos">
-    /** @type {MetricsReporting} */
-    metricsReporting_: Object,
+    /** @private {chrome.settingsPrivate.PrefObject} */
+    metricsReportingPref_: {
+      type: Object,
+      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} */({});
+      },
+    },
 
     showRestart_: Boolean,
 // </if>
 
-    /** @private */
-    safeBrowsingExtendedReportingEnabled_: Boolean,
+    /** @private {chrome.settingsPrivate.PrefObject} */
+    safeBrowsingExtendedReportingPref_: {
+      type: Object,
+      value: function() {
+        return /** @type {chrome.settingsPrivate.PrefObject} */({});
+      },
+    },
 
     /** @private */
     showClearBrowsingDataDialog_: Boolean,
   },
 
   ready: function() {
     this.ContentSettingsTypes = settings.ContentSettingsTypes;
 
+    this.browserProxy_ = settings.PrivacyPageBrowserProxyImpl.getInstance();

[dpapad, 2017/02/13 20:17:50]

Can we also declare this before initializing it?

browserProxy_: null,

ready: function() {
  this.browserProxy_ ...
  ...
},
...

[Dan Beam, 2017/02/13 20:18:50]

what benefit does that have?

+
 // <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);
+    var setMetricsReportingPref = this.setMetricsReportingPref_.bind(this);
+    this.addWebUIListener('metrics-reporting-change', setMetricsReportingPref);
+    this.browserProxy_.getMetricsReporting().then(setMetricsReportingPref);
 // </if>
 
-    var boundSetSber = this.setSafeBrowsingExtendedReporting_.bind(this);
-    this.addWebUIListener('safe-browsing-extended-reporting-change',
-                          boundSetSber);
-    settings.PrivacyPageBrowserProxyImpl.getInstance()
-        .getSafeBrowsingExtendedReporting().then(boundSetSber);
+    var setSber = this.setSafeBrowsingExtendedReporting_.bind(this);
+    this.addWebUIListener('safe-browsing-extended-reporting-change', setSber);
+    this.browserProxy_.getSafeBrowsingExtendedReporting().then(setSber);
   },
 
   /** @protected */
   currentRouteChanged: function() {
     this.showClearBrowsingDataDialog_ =
         settings.getCurrentRoute() == settings.Route.CLEAR_BROWSER_DATA;
   },
 
   /** @private */
   onManageCertificatesTap_: function() {
 // <if expr="use_nss_certs">
     settings.navigateTo(settings.Route.CERTIFICATES);
 // </if>
 // <if expr="is_win or is_macosx">
-    settings.PrivacyPageBrowserProxyImpl.getInstance().
-        showManageSSLCertificates();
+    this.browserProxy_.showManageSSLCertificates();
 // </if>
   },
 
   /**
    * This is a workaround to connect the remove all button to the subpage.
    * @private
    */
   onRemoveAllCookiesFromSite_: function() {
     var node = /** @type {?SiteDataDetailsSubpageElement} */(this.$$(
         'site-data-details-subpage'));
@@ skipping 15 matching lines @@
   onDialogClosed_: function() {
     settings.navigateToPreviousRoute();
   },
 
   /** @private */
   onHelpTap_: function() {
     window.open(
         'https://support.google.com/chrome/?p=settings_manage_exceptions');
   },
 
+  /** @private */
+  onSberChange_: function() {
+    var enabled = this.$.safeBrowsingExtendedReportingControl.checked;
+    this.browserProxy_.setSafeBrowsingExtendedReportingEnabled(enabled);
+  },
+
 // <if expr="_google_chrome and not chromeos">
   /** @private */
-  onMetricsReportingControlTap_: function() {
-    var browserProxy = settings.PrivacyPageBrowserProxyImpl.getInstance();
+  onMetricsReportingChange_: function() {
     var enabled = this.$.metricsReportingControl.checked;
-    browserProxy.setMetricsReportingEnabled(enabled);
+    this.browserProxy_.setMetricsReportingEnabled(enabled);
   },
 
   /**
    * @param {!MetricsReporting} metricsReporting
    * @private
    */
-  setMetricsReporting_: function(metricsReporting) {
+  setMetricsReportingPref_: function(metricsReporting) {
+    var hadPreviousPref = this.metricsReportingPref_.value !== undefined;
+    var pref = {
+      key: '',
+      type: chrome.settingsPrivate.PrefType.BOOLEAN,
+      value: metricsReporting.enabled,
+    };
+    if (metricsReporting.managed) {
+      pref.enforcement = chrome.settingsPrivate.Enforcement.ENFORCED;
+      pref.controlledBy = chrome.settingsPrivate.ControlledBy.USER_POLICY;
+    }
+
+    // Ignore the next change because it will happen when we set the pref.
+    this.metricsReportingPref_ = pref;
+
     // TODO(dbeam): remember whether metrics reporting was enabled when Chrome
     // started.
-    if (metricsReporting.managed) {
+    if (metricsReporting.managed)
       this.showRestart_ = false;
-    } else if (this.metricsReporting_ &&
-               metricsReporting.enabled != this.metricsReporting_.enabled) {
+    else if (hadPreviousPref)
       this.showRestart_ = true;
-    }
-    this.metricsReporting_ = metricsReporting;
   },
 
-  /** @private */
-  onRestartTap_: function() {
+  /**
+   * @param {Event} e
+   * @private
+   */
+  onRestartTap_: function(e) {
+    e.stopPropagation();
     settings.LifetimeBrowserProxyImpl.getInstance().restart();
   },
 // </if>
 
-  /** @private */
-  onSafeBrowsingExtendedReportingControlTap_: function() {
-    var browserProxy = settings.PrivacyPageBrowserProxyImpl.getInstance();
-    var enabled = this.$.safeBrowsingExtendedReportingControl.checked;
-    browserProxy.setSafeBrowsingExtendedReportingEnabled(enabled);
-  },
-
-  /** @param {boolean} enabled Whether reporting is enabled or not.
-    * @private
-    */
+  /**
+   * @param {boolean} enabled Whether reporting is enabled or not.
+   * @private
+   */
   setSafeBrowsingExtendedReporting_: function(enabled) {
-    this.safeBrowsingExtendedReportingEnabled_ = enabled;
+    // Ignore the next change because it will happen when we set the pref.
+    this.safeBrowsingExtendedReportingPref_ = {
+      key: '',
+      type: chrome.settingsPrivate.PrefType.BOOLEAN,
+      value: enabled,
+    };
   },
 
   /**
    * The sub-page title for the site or content settings.
    * @return {string}
    * @private
    */
   siteSettingsPageTitle_: function() {
     return loadTimeData.getBoolean('enableSiteSettings') ?
         loadTimeData.getString('siteSettings') :
@@ skipping 12 matching lines @@
    * Works like a ternary operator. E.g. (value ? trueLabel: falseLabel).
    * @param {boolean} value
    * @param {string} trueLabel True label (for example, 'Allow DRM').
    * @param {string} falseLabel False label (for example, 'Blocked').
    * @private
    */
   getStringTernary_: function(value, trueLabel, falseLabel) {
     return value ? trueLabel : falseLabel;
   },
 });