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

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

Issue 2563893002: [MD settings] move adobe storage settings button out of site-settings-category (Closed)
Patch Set: Created 4 years 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 | chrome/browser/resources/settings/privacy_page/privacy_page.js » ('j') | 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/cr_elements/policy/cr_policy_vars_cs s.html"> 1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_vars_cs s.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.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_dialog. html"> 8 <link rel="import" href="/clear_browsing_data_dialog/clear_browsing_data_dialog. html">
9 <link rel="import" href="/controls/settings_checkbox.html"> 9 <link rel="import" href="/controls/settings_checkbox.html">
10 <link rel="import" href="/controls/settings_toggle_button.html"> 10 <link rel="import" href="/controls/settings_toggle_button.html">
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 </site-settings-category> 244 </site-settings-category>
245 </settings-subpage> 245 </settings-subpage>
246 </template> 246 </template>
247 <template is="dom-if" route-path="/content/cookies" no-search> 247 <template is="dom-if" route-path="/content/cookies" no-search>
248 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}"> 248 <settings-subpage page-title="$i18n{siteSettingsCategoryCookies}">
249 <button class="icon-help subpage-title-extra" 249 <button class="icon-help subpage-title-extra"
250 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 250 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
251 <site-settings-category 251 <site-settings-category
252 selected-site="{{selectedSite}}" 252 selected-site="{{selectedSite}}"
253 category="{{ContentSettingsTypes.COOKIES}}"> 253 category="{{ContentSettingsTypes.COOKIES}}">
254 <div class="settings-box cookie-controls"> 254 <div class="settings-box extra-options">
255 <settings-toggle-button class="start" 255 <settings-toggle-button class="start"
256 label="$i18n{thirdPartyCookie}" 256 label="$i18n{thirdPartyCookie}"
257 sub-label="$i18n{thirdPartyCookieSublabel}" 257 sub-label="$i18n{thirdPartyCookieSublabel}"
258 pref="{{prefs.profile.block_third_party_cookies}}"> 258 pref="{{prefs.profile.block_third_party_cookies}}">
259 </settings-toggle-button> 259 </settings-toggle-button>
260 </div> 260 </div>
261 <site-data class="site-data"></site-data> 261 <site-data class="site-data"></site-data>
262 </site-settings-category> 262 </site-settings-category>
263 </settings-subpage> 263 </settings-subpage>
264 </template> 264 </template>
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 </site-settings-category> 338 </site-settings-category>
339 </settings-subpage> 339 </settings-subpage>
340 </template> 340 </template>
341 <template is="dom-if" route-path="/content/flash" no-search> 341 <template is="dom-if" route-path="/content/flash" no-search>
342 <settings-subpage page-title="$i18n{siteSettingsFlash}"> 342 <settings-subpage page-title="$i18n{siteSettingsFlash}">
343 <button class="icon-help subpage-title-extra" 343 <button class="icon-help subpage-title-extra"
344 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 344 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
345 <site-settings-category 345 <site-settings-category
346 selected-site="{{selectedSite}}" 346 selected-site="{{selectedSite}}"
347 category="{{ContentSettingsTypes.PLUGINS}}"> 347 category="{{ContentSettingsTypes.PLUGINS}}">
348 <if expr="chromeos">
349 <div actionable class="settings-box extra-options"
350 on-tap="onAdobeFlashStorageClicked_">
351 <div class="list-item list-button">$i18n{adobeFlashStorage}</div>
352 </div>
353 </if>
348 </site-settings-category> 354 </site-settings-category>
349 </settings-subpage> 355 </settings-subpage>
350 </template> 356 </template>
351 <template is="dom-if" route-path="/content/popups" no-search> 357 <template is="dom-if" route-path="/content/popups" no-search>
352 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}"> 358 <settings-subpage page-title="$i18n{siteSettingsCategoryPopups}">
353 <button class="icon-help subpage-title-extra" 359 <button class="icon-help subpage-title-extra"
354 is="paper-icon-button-light" on-tap="onHelpTap_"></button> 360 is="paper-icon-button-light" on-tap="onHelpTap_"></button>
355 <site-settings-category 361 <site-settings-category
356 selected-site="{{selectedSite}}" 362 selected-site="{{selectedSite}}"
357 category="{{ContentSettingsTypes.POPUPS}}"> 363 category="{{ContentSettingsTypes.POPUPS}}">
(...skipping 28 matching lines...) Expand all
386 $i18n{siteSettingsCookieRemoveAll} 392 $i18n{siteSettingsCookieRemoveAll}
387 </paper-button> 393 </paper-button>
388 <site-data-details-subpage page-title="{{pageTitle}}"> 394 <site-data-details-subpage page-title="{{pageTitle}}">
389 </site-data-details-subpage> 395 </site-data-details-subpage>
390 </settings-subpage> 396 </settings-subpage>
391 </template> 397 </template>
392 </settings-animated-pages> 398 </settings-animated-pages>
393 </template> 399 </template>
394 <script src="privacy_page.js"></script> 400 <script src="privacy_page.js"></script>
395 </dom-module> 401 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/privacy_page/privacy_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698