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

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

Issue 2029453002: MD Settings: About page, implement obsolete/end-of-the-line status. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Resolve conflicts. Created 4 years, 6 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 | chrome/browser/resources/settings/about_page/about_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/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="/settings_page/main_page_behavior.html"> 5 <link rel="import" href="/settings_page/main_page_behavior.html">
6 <link rel="import" href="/settings_page/settings_animated_pages.html"> 6 <link rel="import" href="/settings_page/settings_animated_pages.html">
7 <link rel="import" href="/settings_page/settings_section.html"> 7 <link rel="import" href="/settings_page/settings_section.html">
8 <link rel="import" href="/settings_page_css.html"> 8 <link rel="import" href="/settings_page_css.html">
9 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
10 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 10 <link rel="import" href="chrome://resources/cr_elements/icons.html">
11 <link rel="import" href="chrome://resources/html/assert.html"> 11 <link rel="import" href="chrome://resources/html/assert.html">
12 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 12 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
13 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 13 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
14 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 14 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
15 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 15 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
16 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 16 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
17 17
18 <if expr="chromeos"> 18 <if expr="chromeos">
19 <link rel="import" href="/about_page/detailed_build_info.html"> 19 <link rel="import" href="/about_page/detailed_build_info.html">
20 <link rel="import" href="/settings_page/settings_subpage.html"> 20 <link rel="import" href="/settings_page/settings_subpage.html">
21 </if> 21 </if>
22 22
23 <dom-module id="settings-about-page"> 23 <dom-module id="settings-about-page">
24 <template> 24 <template>
25 <style include="settings-shared settings-page-styles"> 25 <style include="settings-shared settings-page-styles">
26 span { 26 .product-title {
27 font-size: 20px; 27 font-size: 20px;
28 margin-top: auto; 28 margin-top: auto;
29 margin-bottom: auto; 29 margin-bottom: auto;
30 } 30 }
31 31
32 img { 32 img {
33 -webkit-margin-end: 10px; 33 -webkit-margin-end: 10px;
34 } 34 }
35 35
36 iron-icon { 36 iron-icon {
(...skipping 21 matching lines...) Expand all
58 <div data-page="about"> 58 <div data-page="about">
59 <settings-section page-title="$i18n{aboutPageTitle}" 59 <settings-section page-title="$i18n{aboutPageTitle}"
60 current-route="[[currentRoute]]" section="about"> 60 current-route="[[currentRoute]]" section="about">
61 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 61 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
62 section="about"> 62 section="about">
63 <neon-animatable id="main"> 63 <neon-animatable id="main">
64 <div class="settings-box"> 64 <div class="settings-box">
65 <img id="product-logo" 65 <img id="product-logo"
66 srcset="chrome://theme/current-channel-logo@1x 1x, 66 srcset="chrome://theme/current-channel-logo@1x 1x,
67 chrome://theme/current-channel-logo@2x 2x" alt=""> 67 chrome://theme/current-channel-logo@2x 2x" alt="">
68 <span>$i18n{aboutProductTitle}</span> 68 <span class="product-title">$i18n{aboutProductTitle}</span>
69 </div> 69 </div>
70 <div class="settings-box two-line"> 70 <div class="settings-box two-line">
71 <div hidden="[[!shouldShowUpdateStatus_( 71 <iron-icon hidden="[[!shouldShowUpdateStatusIcon_(
72 currentUpdateStatusEvent_)]]"> 72 currentUpdateStatusEvent_)]]"
73 <iron-icon 73 icon$="[[getIcon_(currentUpdateStatusEvent_)]]"
74 icon$="[[getIcon_(currentUpdateStatusEvent_)]]" 74 src="[[getIconSrc_(currentUpdateStatusEvent_)]]">
dschuyler 2016/06/01 22:37:11 nit: The line wrapping may be technically ok. I fi
dpapad 2016/06/01 23:38:14 Done.
75 src="[[getIconSrc_(currentUpdateStatusEvent_)]]"> 75 </iron-icon>
76 </iron-icon>
77 </div>
78 <div class="start"> 76 <div class="start">
79 <div hidden="[[!shouldShowUpdateStatus_( 77 <div id="updateStatusMessage"
80 currentUpdateStatusEvent_)]]"> 78 hidden="[[!shouldShowUpdateStatusMessage_(
79 currentUpdateStatusEvent_)]]">
81 [[getUpdateStatusMessage_( 80 [[getUpdateStatusMessage_(
82 currentUpdateStatusEvent_, targetChannel_)]] 81 currentUpdateStatusEvent_,targetChannel)]]
83 </div> 82 </div>
83 <span id="deprecationWarning"
84 hidden="[[!obsoleteSystemInfo_.obsolete]]">
85 $i18n{aboutObsoleteSystem}
86 <a href="$i18n{aboutObsoleteSystemURL}" target="_blank">
87 $i18n{learnMore}
88 </a>
89 </span>
84 <div class="secondary">$i18n{aboutBrowserVersion}</div> 90 <div class="secondary">$i18n{aboutBrowserVersion}</div>
85 </div> 91 </div>
86 <paper-button id="relaunch" class="secondary-action" 92 <paper-button id="relaunch" class="secondary-action"
87 <if expr="not chromeos"> 93 <if expr="not chromeos">
88 hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]" 94 hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]"
89 </if> 95 </if>
90 <if expr="chromeos"> 96 <if expr="chromeos">
91 hidden="[[!shouldShowRelaunch_( 97 hidden="[[!shouldShowRelaunch_(
92 currentUpdateStatusEvent_, targetChannel_)]]" 98 currentUpdateStatusEvent_, targetChannel_)]]"
93 </if> 99 </if>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 <settings-detailed-build-info></settings-detailed-build-info> 158 <settings-detailed-build-info></settings-detailed-build-info>
153 </settings-subpage> 159 </settings-subpage>
154 </template> 160 </template>
155 </if> 161 </if>
156 </settings-animated-pages> 162 </settings-animated-pages>
157 </settings-section> 163 </settings-section>
158 </div> 164 </div>
159 </template> 165 </template>
160 <script src="about_page.js"></script> 166 <script src="about_page.js"></script>
161 </dom-module> 167 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/about_page/about_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698