Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Side by Side Diff: chrome/browser/resources/settings/privacy_page/privacy_page.html

Issue 2684853003: MD Settings: change how tap is handled on custom toggle rows (Closed)
Patch Set: . Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html"> 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
8 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> 8 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html">
9 <link rel="import" href="../controls/settings_toggle_button.html"> 9 <link rel="import" href="../controls/settings_toggle_button.html">
10 <link rel="import" href="../lifetime_browser_proxy.html"> 10 <link rel="import" href="../lifetime_browser_proxy.html">
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 label="$i18n{searchSuggestPref}"> 74 label="$i18n{searchSuggestPref}">
75 </settings-toggle-button> 75 </settings-toggle-button>
76 </div> 76 </div>
77 <div class="settings-box" 77 <div class="settings-box"
78 hidden="[[!pageVisibility.networkPrediction]]"> 78 hidden="[[!pageVisibility.networkPrediction]]">
79 <settings-toggle-button class="start" 79 <settings-toggle-button class="start"
80 pref="{{prefs.net.network_prediction_options}}" 80 pref="{{prefs.net.network_prediction_options}}"
81 label="$i18n{networkPredictionEnabled}"> 81 label="$i18n{networkPredictionEnabled}">
82 </settings-toggle-button> 82 </settings-toggle-button>
83 </div> 83 </div>
84 <div class="settings-box"> 84 <div class="settings-box">
Dan Beam 2017/02/08 23:12:04 actionable or on-tap on the settings-box itself is
dpapad 2017/02/08 23:46:05 Wrapping the <div> and the <paper-toggle-button> w
85 <div class="start">$i18n{safeBrowsingEnableExtendedReporting}</div> 85 <div class="start" on-tap="onSafeBrowsingExtendedReportingTap_"
86 actionable>
87 $i18n{safeBrowsingEnableExtendedReporting}
88 </div>
86 <paper-toggle-button id="safeBrowsingExtendedReportingControl" 89 <paper-toggle-button id="safeBrowsingExtendedReportingControl"
87 on-tap="onSafeBrowsingExtendedReportingControlTap_" 90 on-tap="onSafeBrowsingExtendedReportingTap_"
88 checked="[[safeBrowsingExtendedReportingEnabled_]]"> 91 checked="[[safeBrowsingExtendedReportingEnabled_]]">
89 </paper-toggle-button> 92 </paper-toggle-button>
90 </div> 93 </div>
91 <div class="settings-box"> 94 <div class="settings-box">
92 <settings-toggle-button class="start" 95 <settings-toggle-button class="start"
93 pref="{{prefs.safebrowsing.enabled}}" 96 pref="{{prefs.safebrowsing.enabled}}"
94 label="$i18n{safeBrowsingEnableProtection}"> 97 label="$i18n{safeBrowsingEnableProtection}">
95 </settings-toggle-button> 98 </settings-toggle-button>
96 </div> 99 </div>
97 <if expr="_google_chrome"> 100 <if expr="_google_chrome">
98 <if expr="chromeos"> 101 <if expr="chromeos">
99 <div class="settings-box"> 102 <div class="settings-box">
100 <settings-toggle-button class="start" 103 <settings-toggle-button class="start"
101 pref="{{prefs.cros.metrics.reportingEnabled}}" 104 pref="{{prefs.cros.metrics.reportingEnabled}}"
102 label="$i18n{enableLogging}"> 105 label="$i18n{enableLogging}">
103 </settings-toggle-button> 106 </settings-toggle-button>
104 </div> 107 </div>
105 </if><!-- chromeos --> 108 </if><!-- chromeos -->
106 <if expr="not chromeos"> 109 <if expr="not chromeos">
107 <div class="settings-box"> 110 <div class="settings-box">
Dan Beam 2017/02/08 23:12:04 in this case we really don't want on-tap on the se
dpapad 2017/02/08 23:46:05 I don't have a 100% understanding of our requireme
Dan Beam 2017/02/09 00:27:40 that's the same for all existing <settings-toggle-
108 <div class="start">$i18n{enableLogging}</div> 111 <div class="start" on-tap="onMetricsReportingTap_"
112 actionable$="[[!metricsReporting_.managed]]">
113 $i18n{enableLogging}
114 </div>
109 <template is="dom-if" if="[[showRestart_]]" restamp> 115 <template is="dom-if" if="[[showRestart_]]" restamp>
110 <paper-button on-tap="onRestartTap_" id="restart"> 116 <paper-button on-tap="onRestartTap_" id="restart">
111 $i18n{restart} 117 $i18n{restart}
112 </paper-button> 118 </paper-button>
113 </template> 119 </template>
114 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp> 120 <template is="dom-if" if="[[metricsReporting_.managed]]" restamp>
115 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon> 121 <iron-icon id="indicator" tabindex=0 icon="cr:domain"></iron-icon>
116 <paper-tooltip for="indicator" position="top" 122 <paper-tooltip for="indicator" position="top"
117 fit-to-visible-bounds> 123 fit-to-visible-bounds>
118 $i18n{controlledSettingPolicy} 124 $i18n{controlledSettingPolicy}
119 </paper-tooltip> 125 </paper-tooltip>
120 </template> 126 </template>
121 <paper-toggle-button id="metricsReportingControl" 127 <paper-toggle-button id="metricsReportingControl"
122 on-tap="onMetricsReportingControlTap_" 128 on-tap="onMetricsReportingTap_"
123 checked="[[metricsReporting_.enabled]]" 129 checked="[[metricsReporting_.enabled]]"
124 disabled="[[metricsReporting_.managed]]"> 130 disabled="[[metricsReporting_.managed]]">
125 </paper-toggle-button> 131 </paper-toggle-button>
126 </div> 132 </div>
127 </if><!-- not chromeos --> 133 </if><!-- not chromeos -->
128 </if><!-- _google_chrome --> 134 </if><!-- _google_chrome -->
129 <div class="settings-box"> 135 <div class="settings-box">
130 <settings-toggle-button class="start" 136 <settings-toggle-button class="start"
131 pref="{{prefs.enable_do_not_track}}" 137 pref="{{prefs.enable_do_not_track}}"
132 label="$i18n{doNotTrack}"> 138 label="$i18n{doNotTrack}">
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
457 <category-setting-exceptions 463 <category-setting-exceptions
458 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> 464 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
459 </category-setting-exceptions> 465 </category-setting-exceptions>
460 </if> 466 </if>
461 </settings-subpage> 467 </settings-subpage>
462 </template> 468 </template>
463 </settings-animated-pages> 469 </settings-animated-pages>
464 </template> 470 </template>
465 <script src="privacy_page.js"></script> 471 <script src="privacy_page.js"></script>
466 </dom-module> 472 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698