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

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

Issue 2888493002: MD Settings: About page, move copyright text in it's own card. (Closed)
Patch Set: add back unnecessary div to preserve diff for now 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 <link rel="import" href="about_page_browser_proxy.html"> 2 <link rel="import" href="about_page_browser_proxy.html">
3 <link rel="import" href="../i18n_setup.html"> 3 <link rel="import" href="../i18n_setup.html">
4 <link rel="import" href="../icons.html"> 4 <link rel="import" href="../icons.html">
5 <link rel="import" href="../lifetime_browser_proxy.html"> 5 <link rel="import" href="../lifetime_browser_proxy.html">
6 <link rel="import" href="../route.html"> 6 <link rel="import" href="../route.html">
7 <link rel="import" href="../settings_page/main_page_behavior.html"> 7 <link rel="import" href="../settings_page/main_page_behavior.html">
8 <link rel="import" href="../settings_page/settings_animated_pages.html"> 8 <link rel="import" href="../settings_page/settings_animated_pages.html">
9 <link rel="import" href="../settings_page/settings_section.html"> 9 <link rel="import" href="../settings_page/settings_section.html">
10 <link rel="import" href="../settings_page_css.html"> 10 <link rel="import" href="../settings_page_css.html">
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 <if expr="chromeos"> 183 <if expr="chromeos">
184 <div class="settings-box" on-tap="onDetailedBuildInfoTap_" 184 <div class="settings-box" on-tap="onDetailedBuildInfoTap_"
185 actionable> 185 actionable>
186 <div class="start">$i18n{aboutDetailedBuildInfo}</div> 186 <div class="start">$i18n{aboutDetailedBuildInfo}</div>
187 <button id="detailed-build-info-trigger" class="subpage-arrow" 187 <button id="detailed-build-info-trigger" class="subpage-arrow"
188 is="paper-icon-button-light" 188 is="paper-icon-button-light"
189 aria-label="$i18n{aboutDetailedBuildInfo}"> 189 aria-label="$i18n{aboutDetailedBuildInfo}">
190 </button> 190 </button>
191 </div> 191 </div>
192 </if> 192 </if>
193 <div class="settings-box padded block copyable">
194 <div class="info-section">
195 <div class="secondary">$i18n{aboutProductTitle}</div>
196 <div class="secondary">$i18n{aboutProductCopyright}</div>
197 </div>
198
199 <div class="info-section">
200 <div class="secondary">$i18nRaw{aboutProductLicense}</div>
201 <if expr="chromeos">
202 <div class="secondary">$i18nRaw{aboutProductOsLicense}</div>
203 </if>
204 </div>
205 <if expr="_google_chrome">
206 <div class="secondary">$i18nRaw{aboutProductTos}</div>
207 </if>
208 </div>
209 <if expr="chromeos">
210 <div class="settings-box padded block" id="regulatoryInfo"
211 hidden$="[[!shouldShowRegulatoryInfo_(regulatoryInfo_)]]">
212 <img src="[[regulatoryInfo_.url]]" alt="[[regulatoryInfo_.text]]">
213 </div>
214 </if>
215 </neon-animatable> 193 </neon-animatable>
216 <if expr="chromeos"> 194 <if expr="chromeos">
217 <template is="dom-if" route-path="/help/details"> 195 <template is="dom-if" route-path="/help/details">
218 <settings-subpage page-title="$i18n{aboutDetailedBuildInfo}"> 196 <settings-subpage page-title="$i18n{aboutDetailedBuildInfo}">
219 <settings-detailed-build-info></settings-detailed-build-info> 197 <settings-detailed-build-info></settings-detailed-build-info>
220 </settings-subpage> 198 </settings-subpage>
221 </template> 199 </template>
222 </if> 200 </if>
223 </settings-animated-pages> 201 </settings-animated-pages>
224 </settings-section> 202 </settings-section>
203
204 <settings-section>
205 <div class="settings-box padded block copyable">
206 <div class="info-section">
207 <div class="secondary">$i18n{aboutProductTitle}</div>
208 <div class="secondary">$i18n{aboutProductCopyright}</div>
209 </div>
210
211 <div class="info-section">
212 <div class="secondary">$i18nRaw{aboutProductLicense}</div>
213 <if expr="chromeos">
214 <div class="secondary">$i18nRaw{aboutProductOsLicense}</div>
215 </if>
216 </div>
217 <if expr="_google_chrome">
218 <div class="secondary">$i18nRaw{aboutProductTos}</div>
219 </if>
220 </div>
221 <if expr="chromeos">
222 <div class="settings-box padded block" id="regulatoryInfo"
223 hidden$="[[!shouldShowRegulatoryInfo_(regulatoryInfo_)]]">
224 <img src="[[regulatoryInfo_.url]]" alt="[[regulatoryInfo_.text]]">
225 </div>
226 </if>
227 </settings-section>
225 </div> 228 </div>
226 <if expr="chromeos"> 229 <if expr="chromeos">
227 <template is="dom-if" if="[[showUpdateWarningDialog_]]" restamp> 230 <template is="dom-if" if="[[showUpdateWarningDialog_]]" restamp>
228 <settings-update-warning-dialog update-info="[[updateInfo_]]" 231 <settings-update-warning-dialog update-info="[[updateInfo_]]"
229 on-close="onUpdateWarningDialogClose_"> 232 on-close="onUpdateWarningDialogClose_">
230 </settings-update-warning-dialog> 233 </settings-update-warning-dialog>
231 </template> 234 </template>
232 </if> 235 </if>
233 </template> 236 </template>
234 <script src="about_page.js"></script> 237 <script src="about_page.js"></script>
235 </dom-module> 238 </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