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

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

Issue 2221563002: MD Settings: About page, allow error messages to contain HTML. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Done. Created 4 years, 4 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/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="/about_page/about_page_browser_proxy.html"> 2 <link rel="import" href="/about_page/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">
11 <link rel="import" href="/settings_shared_css.html"> 11 <link rel="import" href="/settings_shared_css.html">
12 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 12 <link rel="import" href="chrome://resources/cr_elements/icons.html">
13 <link rel="import" href="chrome://resources/html/assert.html"> 13 <link rel="import" href="chrome://resources/html/assert.html">
14 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 14 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
15 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 15 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
16 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 16 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
17 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 17 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
18 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 18 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
Dan Beam 2016/08/05 23:45:28 <link rel="import" href="chrome://resources/html/p
19 19
20 <if expr="chromeos"> 20 <if expr="chromeos">
21 <link rel="import" href="/about_page/detailed_build_info.html"> 21 <link rel="import" href="/about_page/detailed_build_info.html">
22 <link rel="import" href="/settings_page/settings_subpage.html"> 22 <link rel="import" href="/settings_page/settings_subpage.html">
23 </if> 23 </if>
24 24
25 <dom-module id="settings-about-page"> 25 <dom-module id="settings-about-page">
26 <template> 26 <template>
27 <style include="settings-shared settings-page-styles"> 27 <style include="settings-shared settings-page-styles">
28 .copyable { 28 .copyable {
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 <div class="settings-box two-line"> 80 <div class="settings-box two-line">
81 <iron-icon 81 <iron-icon
82 hidden="[[!shouldShowUpdateStatusIcon_( 82 hidden="[[!shouldShowUpdateStatusIcon_(
83 currentUpdateStatusEvent_)]]" 83 currentUpdateStatusEvent_)]]"
84 icon$="[[getIcon_(currentUpdateStatusEvent_)]]" 84 icon$="[[getIcon_(currentUpdateStatusEvent_)]]"
85 src="[[getIconSrc_(currentUpdateStatusEvent_)]]"> 85 src="[[getIconSrc_(currentUpdateStatusEvent_)]]">
86 </iron-icon> 86 </iron-icon>
87 <div class="start"> 87 <div class="start">
88 <div id="updateStatusMessage" 88 <div id="updateStatusMessage"
89 hidden="[[!shouldShowUpdateStatusMessage_( 89 hidden="[[!shouldShowUpdateStatusMessage_(
90 currentUpdateStatusEvent_)]]"
91 <if expr="not chromeos">
92 inner-h-t-m-l="[[getUpdateStatusMessage_(
90 currentUpdateStatusEvent_)]]"> 93 currentUpdateStatusEvent_)]]">
91 <if expr="not chromeos">
92 [[getUpdateStatusMessage_(currentUpdateStatusEvent_)]]
93 </if> 94 </if>
94 <if expr="chromeos"> 95 <if expr="chromeos">
95 [[getUpdateStatusMessage_( 96 inner-h-t-m-l="[[getUpdateStatusMessage_(
96 currentUpdateStatusEvent_, targetChannel_)]] 97 currentUpdateStatusEvent_, targetChannel_)]]">
97 </if> 98 </if>
98 </div> 99 </div>
99 <span id="deprecationWarning" 100 <span id="deprecationWarning"
100 hidden="[[!obsoleteSystemInfo_.obsolete]]"> 101 hidden="[[!obsoleteSystemInfo_.obsolete]]">
101 $i18n{aboutObsoleteSystem} 102 $i18n{aboutObsoleteSystem}
102 <a href="$i18n{aboutObsoleteSystemURL}" target="_blank"> 103 <a href="$i18n{aboutObsoleteSystemURL}" target="_blank">
103 $i18n{learnMore} 104 $i18n{learnMore}
104 </a> 105 </a>
105 </span> 106 </span>
106 <div class="secondary copyable">$i18n{aboutBrowserVersion}</div> 107 <div class="secondary copyable">$i18n{aboutBrowserVersion}</div>
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 <settings-detailed-build-info></settings-detailed-build-info> 177 <settings-detailed-build-info></settings-detailed-build-info>
177 </settings-subpage> 178 </settings-subpage>
178 </template> 179 </template>
179 </if> 180 </if>
180 </settings-animated-pages> 181 </settings-animated-pages>
181 </settings-section> 182 </settings-section>
182 </div> 183 </div>
183 </template> 184 </template>
184 <script src="about_page.js"></script> 185 <script src="about_page.js"></script>
185 </dom-module> 186 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698