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

Unified Diff: chrome/browser/resources/settings/about_page/about_page.html

Issue 1987813004: MD Settings: About page, implementing update status. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update test, after changing "=" to "$=" Created 4 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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/about_page/about_page.html
diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chrome/browser/resources/settings/about_page/about_page.html
index 14f8089616c9eb53e71388e14b367df4215c6e3c..a3095ba3ff49e4fea391c6d26eacee625417278d 100644
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html
@@ -1,9 +1,15 @@
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://md-settings/about_page/about_page_browser_proxy.html">
+<link rel="import" href="chrome://md-settings/i18n_setup.html">
+<link rel="import" href="chrome://md-settings/icons.html">
<link rel="import" href="chrome://md-settings/settings_page/main_page_behavior.html">
<link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html">
<link rel="import" href="chrome://md-settings/settings_page/settings_section.html">
<link rel="import" href="chrome://md-settings/settings_shared_css.html">
+<link rel="import" href="chrome://resources/cr_elements/icons.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
+<link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
+<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
<link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
@@ -25,6 +31,18 @@
img {
-webkit-margin-end: 10px;
}
+
+ iron-icon {
+ -webkit-margin-end: var(--iron-icon-spacing);
+ }
+
+ iron-icon[icon="settings:check-circle"] {
+ fill: var(--paper-blue-600);
+ }
+
+ iron-icon[icon="settings:error"] {
+ fill: var(--paper-red-600);
+ }
</style>
<settings-section page-title="$i18n{aboutPageTitle}"
current-route="[[currentRoute]]" section="about">
@@ -38,14 +56,21 @@
<span>$i18n{aboutProductTitle}</span>
</div>
<div class="settings-box two-line">
- <!-- TODO(dpapad): Implement this. -->
- <div class="start">
- <div>Your device is up to date</div>
- <div class="secondary">Version Foo.bar.baz</div>
+ <div hidden="[[!shouldShowUpdateStatus_(currentUpdateStatusEvent_)]]">
+ <iron-icon
+ icon$="[[getIcon_(currentUpdateStatusEvent_)]]"
+ src="[[getIconSrc_(currentUpdateStatusEvent_)]]">
+ </iron-icon>
</div>
- <div class="secondary-action">
- <paper-button class="secondary-button">Check for update</paper-button>
+ <div class="start">
+ <div hidden="[[!shouldShowUpdateStatus_(currentUpdateStatusEvent_)]]">
+ [[getUpdateStatusMessage_(currentUpdateStatusEvent_)]]
+ </div>
+ <div class="secondary">$i18n{aboutBrowserVersion}</div>
</div>
+<if expr="chromeos">
+ <paper-button class="secondary-action">Check for update</paper-button>
+</if>
</div>
<div id="help" class="settings-box two-line" on-tap="onHelpTap_">
$i18n{aboutGetHelpUsingChrome}
« 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