| Index: chrome/browser/resources/help/help.html
|
| diff --git a/chrome/browser/resources/help/help.html b/chrome/browser/resources/help/help.html
|
| index 3f1dbddf9ae8d5a057681b9d9973b96b4b415616..40658fd1de1944b447799defa2e3320536cf6e87 100644
|
| --- a/chrome/browser/resources/help/help.html
|
| +++ b/chrome/browser/resources/help/help.html
|
| @@ -6,13 +6,31 @@
|
| <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
|
| <link rel="stylesheet" href="../uber/uber_shared.css">
|
| <link rel="stylesheet" href="help.css">
|
| +<if expr="pp_ifdef('chromeos')">
|
| + <link rel="stylesheet" href="chrome://resources/css/bubble.css">
|
| + <link rel="stylesheet" href="chrome://resources/css/overlay.css">
|
| + <link rel="stylesheet" href="channel_change_page.css">
|
| +</if>
|
| +
|
| <script src="chrome://resources/js/cr.js"></script>
|
| <script src="chrome://resources/js/load_time_data.js"></script>
|
| <script src="chrome://resources/js/util.js"></script>
|
| +<if expr="pp_ifdef('chromeos')">
|
| + <script src="chrome://resources/js/cr/ui.js"></script>
|
| + <script src="chrome://resources/js/cr/ui/bubble.js"></script>
|
| + <script src="chrome://resources/js/cr/ui/overlay.js"></script>
|
| + <script src="chrome://resources/js/event_tracker.js"></script>
|
| + <script src="chrome://help-frame/channel_change_page.js"></script>
|
| +</if>
|
| <script src="chrome://help-frame/help.js"></script>
|
| </head>
|
| <body class="uber-frame"
|
| i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
|
| + <div id="overlay-container" class="overlay" hidden>
|
| +<if expr="pp_ifdef('chromeos')">
|
| + <include src="channel_change_page.html">
|
| +</if>
|
| + </div>
|
| <div class="page">
|
| <header>
|
| <h1 i18n-content="aboutTitle"></h1>
|
| @@ -40,7 +58,7 @@
|
| </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>
|
| + <div id="update-status-icon" class="help-page-icon up-to-date"></div>
|
| <div id="update-status-message-container">
|
| <div id="update-status-message" i18n-content="updateCheckStarted">
|
| </div>
|
| @@ -53,11 +71,16 @@
|
| <button id="promote" i18n-content="promote" hidden></button>
|
| </if>
|
| <button id="relaunch" i18n-content="relaunch" hidden></button>
|
| +<if expr="pp_ifdef('chromeos')">
|
| + <button id="relaunch-and-powerwash"
|
| + i18n-content="relaunchAndPowerwash" hidden>
|
| + </button>
|
| +</if>
|
| </div>
|
| </if>
|
| <if expr="pp_ifdef('chromeos')">
|
| <div id="more-info-container">
|
| - <section id="channel-changer-container">
|
| + <section id="channel-changer-container" hidden>
|
| <h3 i18n-content="channel"></h3>
|
| <select id="channel-changer">
|
| <option value="stable-channel" i18n-content="stable"></option>
|
| @@ -66,6 +89,16 @@
|
| </select>
|
| <div id="channel-change-confirmation" hidden></div>
|
| </section>
|
| + <section id="channel-change-page-container" hidden>
|
| + <h3 i18n-content="channel"></h3>
|
| + <div id="current-channel"></div>
|
| + <button id="change-channel"
|
| + i18n-content="channelChangeButton" disabled>
|
| + </button>
|
| + <div id="channel-change-disallowed-icon"
|
| + class="help-page-icon" hidden>
|
| + </div>
|
| + </section>
|
| <section>
|
| <h3 i18n-content="webkit"></h3>
|
| <div i18n-content="webkitVersion" dir="ltr"></div>
|
|
|
Chromium Code Reviews
Issue 17437004:
Implemented new channel switcher UI. (Closed)
Base URL: svn://svn.chromium.org/chrome/trunk/src