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

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

Issue 2731403005: MD Settings: Privacy: Show dialog when changing do-not-track (Closed)
Patch Set: Add learn more link Created 3 years, 9 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/cr_dialog/cr_dialog.html ">
2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html"> 3 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html">
3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 5 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f lex-layout-classes.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
9 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html"> 10 <link rel="import" href="../clear_browsing_data_dialog/clear_browsing_data_dialo g.html">
10 <link rel="import" href="../controls/settings_toggle_button.html"> 11 <link rel="import" href="../controls/settings_toggle_button.html">
11 <link rel="import" href="../lifetime_browser_proxy.html"> 12 <link rel="import" href="../lifetime_browser_proxy.html">
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 <paper-button on-tap="onRestartTap_" id="restart" 103 <paper-button on-tap="onRestartTap_" id="restart"
103 class="more-actions"> 104 class="more-actions">
104 $i18n{restart} 105 $i18n{restart}
105 </paper-button> 106 </paper-button>
106 </template> 107 </template>
107 </settings-toggle-button> 108 </settings-toggle-button>
108 </div> 109 </div>
109 </if><!-- not chromeos --> 110 </if><!-- not chromeos -->
110 </if><!-- _google_chrome --> 111 </if><!-- _google_chrome -->
111 <div class="settings-box"> 112 <div class="settings-box">
112 <settings-toggle-button class="start" 113 <template id="doNotTrackDialogIf" is="dom-if"
113 pref="{{prefs.enable_do_not_track}}" 114 if="[[showDoNotTrackDialog_]]">
114 label="$i18n{doNotTrack}"> 115 <dialog is="cr-dialog" id="confirmDoNotTrackDialog"
116 close-text="$i18n{close}" on-cancel="onDoNotTrackDialogCancel_">
117 <div class="title">$i18n{doNotTrackDialogTitle}</div>
118 <div class="body">$i18nRaw{doNotTrackDialogMessage}</div>
119 <div class="button-container">
120 <paper-button class="cancel-button"
121 on-tap="onDoNotTrackDialogCancel_">
122 $i18n{cancel}
123 </paper-button>
124 <paper-button class="action-button"
125 on-tap="onDoNotTrackDialogConfirm_">
126 $i18n{confirm}
127 </paper-button>
128 </div>
129 </dialog>
130 </template>
Dan Beam 2017/03/10 23:30:50 nit: this is BEFORE the control, we talked this mo
stevenjb 2017/03/10 23:58:20 I guess I was confused in the discussion, I though
Dan Beam 2017/03/13 21:57:51 let's just do whatever until somebody sweeps the w
stevenjb 2017/03/13 23:29:02 Acknowledged.
131 <settings-toggle-button id="doNotTrack" class="start"
132 pref="{{prefs.enable_do_not_track}}" label="$i18n{doNotTrack}"
133 on-change="onDoNotTrackChange_" no-set-pref>
115 </settings-toggle-button> 134 </settings-toggle-button>
116 </div> 135 </div>
117 <if expr="chromeos"> 136 <if expr="chromeos">
118 <div class="settings-box"> 137 <div class="settings-box">
119 <settings-toggle-button class="start" 138 <settings-toggle-button class="start"
120 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" 139 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}"
121 label="$i18n{enableContentProtectionAttestation}"> 140 label="$i18n{enableContentProtectionAttestation}">
122 </settings-toggle-button> 141 </settings-toggle-button>
123 </div> 142 </div>
124 <div class="settings-box"> 143 <div class="settings-box">
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> 472 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
454 </category-setting-exceptions> 473 </category-setting-exceptions>
455 </template> 474 </template>
456 </if> 475 </if>
457 </settings-subpage> 476 </settings-subpage>
458 </template> 477 </template>
459 </settings-animated-pages> 478 </settings-animated-pages>
460 </template> 479 </template>
461 <script src="privacy_page.js"></script> 480 <script src="privacy_page.js"></script>
462 </dom-module> 481 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698