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

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

Issue 1465393002: [MD settings] small change to privacy page to better match UI mocks (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | « chrome/browser/resources/settings/privacy_page/privacy_page.css ('k') | 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/polymer/v1_0/polymer/polymer.html"> 1 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-item/paper-item-b ody.html">
6 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html"> 7 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.html">
7 <link rel="import" href="chrome://md-settings/clear_browsing_data_page/clear_bro wsing_data_page.html"> 8 <link rel="import" href="chrome://md-settings/clear_browsing_data_page/clear_bro wsing_data_page.html">
8 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> 9 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
9 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 10 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
10 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml"> 11 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">
11 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html"> 12 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html">
12 13
13 <dom-module id="settings-privacy-page"> 14 <dom-module id="settings-privacy-page">
14 <link rel="import" type="css" 15 <link rel="import" type="css"
15 href="chrome://md-settings/settings_page/settings_page.css"> 16 href="chrome://md-settings/settings_page/settings_page.css">
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 <settings-checkbox 62 <settings-checkbox
62 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}" 63 pref="{{prefs.cros.device.attestation_for_content_protection_enabl ed}}"
63 i18n-values="label:enableContentProtectionAttestation"> 64 i18n-values="label:enableContentProtectionAttestation">
64 </settings-checkbox> 65 </settings-checkbox>
65 <settings-checkbox 66 <settings-checkbox
66 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}" 67 pref="{{prefs.settings.internet.wake_on_wifi_darkconnect}}"
67 i18n-values="label:wakeOnWifi"> 68 i18n-values="label:wakeOnWifi">
68 </settings-checkbox> 69 </settings-checkbox>
69 </if> 70 </if>
70 </div> 71 </div>
71 <div class="settings-box end-justified"> 72 <div class="settings-box" on-tap="onManageCertificatesTap_">
72 <paper-button 73 <paper-item>
73 on-tap="onManageCertificatesTap_" 74 <paper-item-body>
74 i18n-content="manageCertificates"> 75 <div i18n-content="manageCertificates"></div>
75 </paper-button> 76 </paper-item-body>
76 <paper-button 77 </paper-item>
77 on-tap="onSiteSettingsTap_" 78 </div>
stevenjb 2015/11/24 16:51:12 Is this a style that we will be using elsewhere? I
dschuyler 2015/11/24 17:37:26 That makes sense. I'll keep an eye out and add th
78 i18n-content="siteSettings"> 79 <div class="settings-box" on-tap="onSiteSettingsTap_">
79 </paper-button> 80 <paper-item>
80 <paper-button 81 <paper-item-body>
81 on-tap="onClearBrowsingDataTap_" 82 <div i18n-content="siteSettings"></div>
82 raised i18n-content="clearBrowsingData"> 83 </paper-item-body>
84 </paper-item>
85 </div>
86 <div class="settings-box">
87 <paper-button on-tap="onClearBrowsingDataTap_"
88 i18n-content="clearBrowsingData">
83 </paper-button> 89 </paper-button>
84 </div> 90 </div>
85 </neon-animatable> 91 </neon-animatable>
86 <neon-animatable id="manage-certificates"> 92 <neon-animatable id="manage-certificates">
87 <settings-subheader i18n-values="page-title:manageCertificates"> 93 <settings-subheader i18n-values="page-title:manageCertificates">
88 </settings-subheader> 94 </settings-subheader>
89 <settings-certificate-manager-page> 95 <settings-certificate-manager-page>
90 </settings-certificate-manager-page> 96 </settings-certificate-manager-page>
91 </neon-animatable> 97 </neon-animatable>
92 <neon-animatable id="site-settings"> 98 <neon-animatable id="site-settings">
93 <settings-subheader i18n-values="page-title:siteSettings"> 99 <settings-subheader i18n-values="page-title:siteSettings">
94 </settings-subheader> 100 </settings-subheader>
95 <settings-site-settings-page></settings-site-settings-page> 101 <settings-site-settings-page></settings-site-settings-page>
96 </neon-animatable> 102 </neon-animatable>
97 <neon-animatable id="clear-browsing-data"> 103 <neon-animatable id="clear-browsing-data">
98 <settings-subheader i18n-values="page-title:clearBrowsingData"> 104 <settings-subheader i18n-values="page-title:clearBrowsingData">
99 </settings-subheader> 105 </settings-subheader>
100 <settings-clear-browsing-data-page prefs="{{prefs}}"> 106 <settings-clear-browsing-data-page prefs="{{prefs}}">
101 </settings-clear-browsing-data-page> 107 </settings-clear-browsing-data-page>
102 </neon-animatable> 108 </neon-animatable>
103 </settings-animated-pages> 109 </settings-animated-pages>
104 </template> 110 </template>
105 <script src="privacy_page.js"></script> 111 <script src="privacy_page.js"></script>
106 </dom-module> 112 </dom-module>
OLDNEW
« no previous file with comments | « chrome/browser/resources/settings/privacy_page/privacy_page.css ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698