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

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

Issue 1346823005: Elim cr_button from md-settings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 2 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/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-icon-button/paper -icon-button.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/cr_elements/v1_0/cr_button/cr_button .html">
6 <link rel="import" href="chrome://md-settings/certificate_manager_page/certifica te_manager_page.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/clear_browsing_data_page/clear_bro wsing_data_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/checkbox/checkbox.html"> 8 <link rel="import" href="chrome://md-settings/checkbox/checkbox.html">
9 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.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_subheader.h tml"> 10 <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"> 11 <link rel="import" href="chrome://md-settings/site_settings_page/site_settings_p age.html">
12 12
13 <dom-module id="cr-settings-privacy-page"> 13 <dom-module id="cr-settings-privacy-page">
14 <link rel="import" type="css" 14 <link rel="import" type="css"
15 href="chrome://md-settings/settings_page/settings_page.css"> 15 href="chrome://md-settings/settings_page/settings_page.css">
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 <cr-settings-checkbox 60 <cr-settings-checkbox
61 pref="{{prefs.cros.device.attestation_for_content_protection_enabled }}" 61 pref="{{prefs.cros.device.attestation_for_content_protection_enabled }}"
62 i18n-values="label:enableContentProtectionAttestation"> 62 i18n-values="label:enableContentProtectionAttestation">
63 </cr-settings-checkbox> 63 </cr-settings-checkbox>
64 <cr-settings-checkbox 64 <cr-settings-checkbox
65 pref="{{prefs.settings.internet.wake_on_wifi_ssid}}" 65 pref="{{prefs.settings.internet.wake_on_wifi_ssid}}"
66 i18n-values="label:wakeOnWifi"> 66 i18n-values="label:wakeOnWifi">
67 </cr-settings-checkbox> 67 </cr-settings-checkbox>
68 </if> 68 </if>
69 <div class="privacy-buttons layout horizontal end-justified"> 69 <div class="privacy-buttons layout horizontal end-justified">
70 <cr-button 70 <paper-button
71 on-tap="onManageCertificatesTap_" 71 on-tap="onManageCertificatesTap_"
72 i18n-content="manageCertificates"> 72 i18n-content="manageCertificates">
73 </cr-button> 73 </paper-button>
74 <cr-button 74 <paper-button
75 on-tap="onSiteSettingsTap_" 75 on-tap="onSiteSettingsTap_"
76 i18n-content="siteSettings"> 76 i18n-content="siteSettings">
77 </cr-button> 77 </paper-button>
78 <cr-button 78 <paper-button
79 on-tap="onClearBrowsingDataTap_" 79 on-tap="onClearBrowsingDataTap_"
80 raised i18n-content="clearBrowsingData"> 80 raised i18n-content="clearBrowsingData">
81 </cr-button> 81 </paper-button>
82 </div> 82 </div>
83 </neon-animatable> 83 </neon-animatable>
84 <neon-animatable id="manage-certificates"> 84 <neon-animatable id="manage-certificates">
85 <settings-subheader i18n-values="page-title:manageCertificates"> 85 <settings-subheader i18n-values="page-title:manageCertificates">
86 </settings-subheader> 86 </settings-subheader>
87 <cr-settings-certificate-manager-page> 87 <cr-settings-certificate-manager-page>
88 </cr-settings-certificate-manager-page> 88 </cr-settings-certificate-manager-page>
89 </neon-animatable> 89 </neon-animatable>
90 <neon-animatable id="site-settings"> 90 <neon-animatable id="site-settings">
91 <settings-subheader i18n-values="page-title:siteSettings"> 91 <settings-subheader i18n-values="page-title:siteSettings">
92 </settings-subheader> 92 </settings-subheader>
93 <cr-settings-site-settings-page></cr-settings-site-settings-page> 93 <cr-settings-site-settings-page></cr-settings-site-settings-page>
94 </neon-animatable> 94 </neon-animatable>
95 <neon-animatable id="clear-browsing-data"> 95 <neon-animatable id="clear-browsing-data">
96 <settings-subheader i18n-values="page-title:clearBrowsingData"> 96 <settings-subheader i18n-values="page-title:clearBrowsingData">
97 </settings-subheader> 97 </settings-subheader>
98 <cr-settings-clear-browsing-data-page prefs="{{prefs}}"> 98 <cr-settings-clear-browsing-data-page prefs="{{prefs}}">
99 </cr-settings-clear-browsing-data-page> 99 </cr-settings-clear-browsing-data-page>
100 </neon-animatable> 100 </neon-animatable>
101 </cr-settings-animated-pages> 101 </cr-settings-animated-pages>
102 </template> 102 </template>
103 <script src="privacy_page.js"></script> 103 <script src="privacy_page.js"></script>
104 </dom-module> 104 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698