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

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

Issue 2011703002: MD Settings: About page, hooking up channel switcher dialog. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@about_regulatory_info
Patch Set: Indentation nits, after merging. 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 c5d2652c793a9cbb9ec2c81db906929da2dcdc8a..3b65961fffc918944a073aa5dba9a7a49a4ff819 100644
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html
@@ -78,25 +78,31 @@
<div class="start">
<div hidden="[[!shouldShowUpdateStatus_(
currentUpdateStatusEvent_)]]">
- [[getUpdateStatusMessage_(currentUpdateStatusEvent_)]]
+ [[getUpdateStatusMessage_(
+ currentUpdateStatusEvent_, targetChannel_)]]
</div>
<div class="secondary">$i18n{aboutBrowserVersion}</div>
</div>
<paper-button id="relaunch" class="secondary-action"
+<if expr="not chromeos">
hidden="[[!shouldShowRelaunch_(currentUpdateStatusEvent_)]]"
+</if>
+<if expr="chromeos">
+ hidden="[[!shouldShowRelaunch_(
+ currentUpdateStatusEvent_, targetChannel_)]]"
+</if>
on-tap="onRelaunchTap_">
$i18n{aboutRelaunch}
</paper-button>
<if expr="chromeos">
<paper-button id="relaunchAndPowerwash" class="secondary-action"
hidden="[[!shouldShowRelaunchAndPowerwash_(
- currentUpdateStatusEvent_)]]"
+ currentUpdateStatusEvent_, targetChannel_)]]"
on-tap="onRelaunchAndPowerwashTap_">
$i18n{aboutRelaunchAndPowerwash}
</paper-button>
<paper-button id="checkForUpdates" class="secondary-action"
- hidden="[[!shouldShowCheckUpdates_(
- currentUpdateStatusEvent_)]]"
+ hidden="[[!shouldShowCheckUpdates_(currentUpdateStatusEvent_)]]"
on-tap="onCheckUpdatesTap_">
$i18n{aboutCheckForUpdates}
</paper-button>
« 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