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

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

Issue 2899533002: [MD settings] move <dialog> out of content (Closed)
Patch Set: Created 3 years, 7 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 2
3 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> 3 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html"> 4 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html">
5 <link rel="import" href="chrome://resources/html/assert.html"> 5 <link rel="import" href="chrome://resources/html/assert.html">
6 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html"> 6 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
7 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 7 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
8 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 8 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
(...skipping 26 matching lines...) Expand all
37 37
38 <dom-module id="settings-privacy-page"> 38 <dom-module id="settings-privacy-page">
39 <template> 39 <template>
40 <style include="settings-shared"> 40 <style include="settings-shared">
41 </style> 41 </style>
42 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp> 42 <template is="dom-if" if="[[showClearBrowsingDataDialog_]]" restamp>
43 <settings-clear-browsing-data-dialog prefs="{{prefs}}" 43 <settings-clear-browsing-data-dialog prefs="{{prefs}}"
44 on-close="onDialogClosed_"> 44 on-close="onDialogClosed_">
45 </settings-clear-browsing-data-dialog> 45 </settings-clear-browsing-data-dialog>
46 </template> 46 </template>
47 <template id="doNotTrackDialogIf" is="dom-if"
48 if="[[showDoNotTrackDialog_]]" notify-dom-change>
49 <dialog is="cr-dialog" id="confirmDoNotTrackDialog"
50 close-text="$i18n{close}" on-cancel="onDoNotTrackDialogCancel_">
51 <div class="title">$i18n{doNotTrackDialogTitle}</div>
52 <div class="body">$i18nRaw{doNotTrackDialogMessage}</div>
53 <div class="button-container">
54 <paper-button class="cancel-button"
55 on-tap="onDoNotTrackDialogCancel_">
56 $i18n{cancel}
57 </paper-button>
58 <paper-button class="action-button"
59 on-tap="onDoNotTrackDialogConfirm_">
60 $i18n{confirm}
61 </paper-button>
62 </div>
63 </dialog>
64 </template>
dschuyler 2017/05/19 23:46:30 This should be moved with no other changes.
47 <settings-animated-pages id="pages" section="privacy" 65 <settings-animated-pages id="pages" section="privacy"
48 focus-config="[[focusConfig_]]"> 66 focus-config="[[focusConfig_]]">
49 <neon-animatable route-path="default"> 67 <neon-animatable route-path="default">
50 <div class="settings-box first"> 68 <div class="settings-box first">
51 <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p> 69 <p class="privacy-explanation">$i18nRaw{improveBrowsingExperience}</p>
52 </div> 70 </div>
53 <div class="settings-box"> 71 <div class="settings-box">
54 <settings-toggle-button class="start" 72 <settings-toggle-button class="start"
55 pref="{{prefs.alternate_error_pages.enabled}}" 73 pref="{{prefs.alternate_error_pages.enabled}}"
56 label="$i18n{linkDoctorPref}"> 74 label="$i18n{linkDoctorPref}">
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 <paper-button on-tap="onRestartTap_" id="restart" 124 <paper-button on-tap="onRestartTap_" id="restart"
107 class="more-actions"> 125 class="more-actions">
108 $i18n{restart} 126 $i18n{restart}
109 </paper-button> 127 </paper-button>
110 </template> 128 </template>
111 </settings-toggle-button> 129 </settings-toggle-button>
112 </div> 130 </div>
113 </if><!-- not chromeos --> 131 </if><!-- not chromeos -->
114 </if><!-- _google_chrome --> 132 </if><!-- _google_chrome -->
115 <div class="settings-box"> 133 <div class="settings-box">
116 <template id="doNotTrackDialogIf" is="dom-if"
117 if="[[showDoNotTrackDialog_]]" notify-dom-change>
118 <dialog is="cr-dialog" id="confirmDoNotTrackDialog"
119 close-text="$i18n{close}" on-cancel="onDoNotTrackDialogCancel_">
120 <div class="title">$i18n{doNotTrackDialogTitle}</div>
121 <div class="body">$i18nRaw{doNotTrackDialogMessage}</div>
122 <div class="button-container">
123 <paper-button class="cancel-button"
124 on-tap="onDoNotTrackDialogCancel_">
125 $i18n{cancel}
126 </paper-button>
127 <paper-button class="action-button"
dschuyler 2017/05/19 23:46:30 This was picking up CSS from .settings-box paper-
128 on-tap="onDoNotTrackDialogConfirm_">
129 $i18n{confirm}
130 </paper-button>
131 </div>
132 </dialog>
133 </template>
134 <settings-toggle-button id="doNotTrack" class="start" 134 <settings-toggle-button id="doNotTrack" class="start"
135 pref="{{prefs.enable_do_not_track}}" label="$i18n{doNotTrack}" 135 pref="{{prefs.enable_do_not_track}}" label="$i18n{doNotTrack}"
136 on-settings-boolean-control-change="onDoNotTrackChange_" 136 on-settings-boolean-control-change="onDoNotTrackChange_"
137 no-set-pref> 137 no-set-pref>
138 </settings-toggle-button> 138 </settings-toggle-button>
139 </div> 139 </div>
140 <if expr="chromeos"> 140 <if expr="chromeos">
141 <div class="settings-box"> 141 <div class="settings-box">
142 <settings-toggle-button class="start" 142 <settings-toggle-button class="start"
143 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" 143 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}"
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}"> 496 category="{{ContentSettingsTypes.PROTECTED_CONTENT}}">
497 </category-setting-exceptions> 497 </category-setting-exceptions>
498 </template> 498 </template>
499 </if> 499 </if>
500 </settings-subpage> 500 </settings-subpage>
501 </template> 501 </template>
502 </settings-animated-pages> 502 </settings-animated-pages>
503 </template> 503 </template>
504 <script src="privacy_page.js"></script> 504 <script src="privacy_page.js"></script>
505 </dom-module> 505 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698