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

Unified Diff: chrome/browser/resources/help/help.html

Issue 10928061: About page UI: add confirmation message for release channel switch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix help.js indentation as suggested by jhawkins. Created 8 years, 3 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 | « chrome/browser/resources/help/help.css ('k') | chrome/browser/resources/help/help.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/help/help.html
diff --git a/chrome/browser/resources/help/help.html b/chrome/browser/resources/help/help.html
index 61f2be13bb47a7123189c5d336000902fa502570..a55a77320e6e926edfbdc0bb44505800344589f4 100644
--- a/chrome/browser/resources/help/help.html
+++ b/chrome/browser/resources/help/help.html
@@ -37,6 +37,21 @@
<div>
<span i18n-content="firmware"></span>&nbsp;<span id="firmware"></span>
</div>
+</if>
+<if expr="pp_ifdef('chromeos') or pp_ifdef('_google_chrome') or is_linux">
+ <div id="update-status-container" hidden>
+ <div id="update-status-icon" class="up-to-date"></div>
+ <span id="update-status" i18n-content="updateCheckStarted"></span>
+ </div>
+ <div id="update-buttons-container">
+ <div id="update-percentage" hidden></div>
+<if expr="is_macosx">
+ <button id="promote" i18n-content="promote" hidden></button>
+</if>
+ <button id="relaunch" i18n-content="relaunch" hidden></button>
+ </div>
+</if>
+<if expr="pp_ifdef('chromeos')">
<div id="more-info-container">
<section id="channel-changer-container">
<h3 i18n-content="channel"></h3>
@@ -45,6 +60,7 @@
<option value="beta-channel" i18n-content="beta"></option>
<option value="dev-channel" i18n-content="dev"></option>
</select>
+ <div id="channel-change-confirmation" hidden></div>
</section>
<section>
<h3 i18n-content="webkit"></h3>
@@ -71,19 +87,6 @@
i18n-content="showMoreInfo">
</button>
</if>
-<if expr="pp_ifdef('chromeos') or pp_ifdef('_google_chrome') or is_linux">
- <div id="update-status-container" hidden>
- <div id="update-status-icon" class="up-to-date"></div>
- <span id="update-status" i18n-content="updateCheckStarted"></span>
- </div>
- <div id="update-buttons-container">
- <div id="update-percentage" hidden></div>
-<if expr="is_macosx">
- <button id="promote" i18n-content="promote" hidden></button>
-</if>
- <button id="relaunch" i18n-content="relaunch" hidden></button>
- </div>
-</if>
</div>
<div id="product-container">
<div i18n-content="productName"></div>
« no previous file with comments | « chrome/browser/resources/help/help.css ('k') | chrome/browser/resources/help/help.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698