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

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: Nit. 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
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 312edac87c91a60fc2fbc0e29fd843903b1b257c..79bd307f543108db337290b16ddd8b6b0d08136d 100644
--- a/chrome/browser/resources/settings/about_page/about_page.html
+++ b/chrome/browser/resources/settings/about_page/about_page.html
@@ -75,18 +75,23 @@
</div>
<div class="start">
<div hidden="[[!shouldShowUpdateStatus_(currentUpdateStatusEvent_)]]">
- [[getUpdateStatusMessage_(currentUpdateStatusEvent_)]]
+ [[getUpdateStatusMessage_(currentUpdateStatusEvent_,targetChannel_)]]
dschuyler 2016/05/27 22:16:21 Please wrap line (and/or add a space after the com
dpapad 2016/05/27 23:32:17 Done.
</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_)]]"
dschuyler 2016/05/27 22:16:21 Please wrap line (and/or add a space after the com
dpapad 2016/05/27 23:32:17 Done. Regarding breaking line: Do we have a rule
dschuyler 2016/05/28 00:07:43 It's at https://www.chromium.org/developers/web-d
+</if>
on-tap="onRelaunchTap_">
$i18n{aboutRelaunch}
</paper-button>
<if expr="chromeos">
<paper-button id="relaunchAndPowerwash" class="secondary-action"
- hidden="[[!shouldShowRelaunchAndPowerwash_(currentUpdateStatusEvent_)]]"
+ hidden="[[!shouldShowRelaunchAndPowerwash_(currentUpdateStatusEvent_,targetChannel_)]]"
dschuyler 2016/05/27 22:16:21 Please wrap line and add a space after the comma.
dpapad 2016/05/27 23:32:17 Done.
on-tap="onRelaunchAndPowerwashTap_">
$i18n{aboutRelaunchAndPowerwash}
</paper-button>

Powered by Google App Engine
This is Rietveld 408576698