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

chrome/browser/resources/settings/privacy_page/privacy_page.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_css.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialog.html">
 <link rel="import" href="../controls/settings_toggle_button.html">
 <link rel="import" href="../lifetime_browser_proxy.html">
@@ skipping 19 matching lines @@
 <link rel="import" href="../certificate_manager_page/certificate_manager_page.html">
 </if>
 <link rel="import" href="privacy_page_browser_proxy.html">
 
 <dom-module id="settings-privacy-page">
   <template>
     <style include="settings-shared">
       button[is='paper-icon-button-light'].icon-help {
         background-image: url(../images/help_outline.svg);
       }
-
-      .settings-row-min-height {
-        min-height: var(--settings-row-min-height);
-      }
-
-      #metricsReporting paper-tooltip {
-        --paper-tooltip: var(--cr-policy-tooltip);
-      }
-
-      #metricsReportingControl,
-      #indicator,
-      #restart {
-        -webkit-margin-start: var(--checkbox-spacing);
-      }
     </style>
     <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp>
       <settings-clear-browsing-data-dialog prefs="{{prefs}}"
           on-close="onDialogClosed_">
       </settings-clear-browsing-data-dialog>
     </template>
     <settings-animated-pages id="pages" section="privacy">
       <neon-animatable route-path="default">
         <div class="settings-box first">
           <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p>
@@ skipping 11 matching lines @@
           </settings-toggle-button>
         </div>
         <div class="settings-box"
             hidden="[[!pageVisibility.networkPrediction]]">
           <settings-toggle-button class="start"
               pref="{{prefs.net.network_prediction_options}}"
               label="$i18n{networkPredictionEnabled}">
           </settings-toggle-button>
         </div>
         <div class="settings-box">
-          <div class="start">$i18n{safeBrowsingEnableExtendedReporting}</div>
-          <paper-toggle-button id="safeBrowsingExtendedReportingControl"
-              on-tap="onSafeBrowsingExtendedReportingControlTap_"
-              checked="[[safeBrowsingExtendedReportingEnabled_]]">
-          </paper-toggle-button>
+          <settings-toggle-button class="start"
+              id="safeBrowsingExtendedReportingControl"
+              pref="[[safeBrowsingExtendedReportingPref_]]"
+              label="$i18n{safeBrowsingEnableExtendedReporting}"
+              no-set-pref>
+          </settings-toggle-button>
         </div>
         <div class="settings-box">
           <settings-toggle-button class="start"
               pref="{{prefs.safebrowsing.enabled}}"
               label="$i18n{safeBrowsingEnableProtection}">
           </settings-toggle-button>
         </div>
 <if expr="_google_chrome">
 <if expr="chromeos">
         <div class="settings-box">
           <settings-toggle-button class="start"
               pref="{{prefs.cros.metrics.reportingEnabled}}"
               label="$i18n{enableLogging}">
           </settings-toggle-button>
         </div>
 </if><!-- chromeos -->
 <if expr="not chromeos">
         <div class="settings-box">
-          <div class="start">$i18n{enableLogging}</div>
-          <template is="dom-if" if="[[showRestart_]]" restamp>
-            <paper-button on-tap="onRestartTap_" id="restart">
-              $i18n{restart}
-            </paper-button>
-          </template>
-          <template is="dom-if" if="[[metricsReporting_.managed]]" restamp>
-            <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon>
-            <paper-tooltip for="indicator" position="top"
-                fit-to-visible-bounds>
-              $i18n{controlledSettingPolicy}
-            </paper-tooltip>
-          </template>
-          <paper-toggle-button id="metricsReportingControl"
-              on-tap="onMetricsReportingControlTap_"
-              checked="[[metricsReporting_.enabled]]"
-              disabled="[[metricsReporting_.managed]]">
-          </paper-toggle-button>
+          <settings-toggle-button class="start"
+              id="metricsReportingControl"
+              pref="[[metricsReportingPref_]]"
+              label="$i18n{enableLogging}"
+              no-set-pref>
+            <template is="dom-if" if="[[showRestart_]]" restamp>
+              <paper-button on-tap="onRestartTap_" id="restart"
+                  class="more-actions">
+                $i18n{restart}
+              </paper-button>
+            </template>
+          </settings-toggle-button>
         </div>
 </if><!-- not chromeos -->
 </if><!-- _google_chrome -->
         <div class="settings-box">
           <settings-toggle-button class="start"
               pref="{{prefs.enable_do_not_track}}"
               label="$i18n{doNotTrack}">
           </settings-toggle-button>
         </div>
 <if expr="chromeos">
@@ skipping 321 matching lines @@
           <category-setting-exceptions
               category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
           </category-setting-exceptions>
 </if>
         </settings-subpage>
       </template>
     </settings-animated-pages>
   </template>
   <script src="privacy_page.js"></script>
 </dom-module>