| Index: chrome/browser/resources/help/help.html
|
| diff --git a/chrome/browser/resources/help/help.html b/chrome/browser/resources/help/help.html
|
| index 57cee7a58efd632348e37ef17feaaf028b50d24b..6d7b1fbf11204ab5488c2e5e48a35e8225e225bf 100644
|
| --- a/chrome/browser/resources/help/help.html
|
| +++ b/chrome/browser/resources/help/help.html
|
| @@ -6,6 +6,7 @@
|
| <link rel="stylesheet" href="chrome://resources/css/chrome_shared.css">
|
| <link rel="stylesheet" href="../uber/uber_shared.css">
|
| <link rel="stylesheet" href="help.css">
|
| + <link rel="stylesheet" href="help_content.css">
|
| <if expr="chromeos">
|
| <link rel="stylesheet" href="chrome://resources/css/bubble.css">
|
| <link rel="stylesheet" href="chrome://resources/css/overlay.css">
|
| @@ -13,141 +14,38 @@
|
| </if>
|
|
|
| <script src="chrome://resources/js/cr.js"></script>
|
| + <script src="chrome://resources/js/cr/event_target.js"></script>
|
| <script src="chrome://resources/js/load_time_data.js"></script>
|
| <script src="chrome://resources/js/util.js"></script>
|
| <script src="chrome://resources/js/cr/ui.js"></script>
|
| <script src="chrome://resources/js/cr/ui/focus_manager.js"></script>
|
| - <script src="chrome://help-frame/help_focus_manager.js"></script>
|
| - <script src="chrome://help-frame/help_base_page.js"></script>
|
| + <script src="chrome://resources/js/cr/ui/focus_outline_manager.js"></script>
|
| + <script src="chrome://resources/js/cr/ui/overlay.js"></script>
|
| + <script src="chrome://resources/js/cr/ui/page_manager/page_manager.js"></script>
|
| + <script src="chrome://resources/js/cr/ui/page_manager/page.js"></script>
|
| <if expr="chromeos">
|
| <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_page.js"></script>
|
| <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>
|
| + <header>
|
| + <h1 i18n-content="aboutTitle"></h1>
|
| + </header>
|
| <if expr="chromeos">
|
| + <div id="overlay-container-1" class="overlay transparent" hidden>
|
| <include src="channel_change_page.html">
|
| -</if>
|
| </div>
|
| - <div id="help-page" class="page">
|
| - <header>
|
| - <h1 i18n-content="aboutTitle"></h1>
|
| - </header>
|
| - <div id="about-container">
|
| - <img src="chrome://theme/IDR_PRODUCT_LOGO_32">
|
| - <div id="product-description">
|
| - <h2 i18n-content="aboutProductTitle"></h2>
|
| - <span i18n-content="aboutProductDescription"></span>
|
| - </div>
|
| - </div>
|
| - <div id="help-container">
|
| - <button id="get-help" i18n-content="getHelpWithChrome"></button>
|
| -<if expr="_google_chrome">
|
| - <button id="report-issue" i18n-content="reportAnIssue"></button>
|
| -</if>
|
| - </div>
|
| - <div id="version-container">
|
| - <div i18n-content="browserVersion" dir="ltr"></div>
|
| -<if expr="chromeos">
|
| - <div>
|
| - <span i18n-content="platform"></span> <span id="os-version"></span>
|
| - </div>
|
| - <div>
|
| - <span i18n-content="firmware"></span> <span id="firmware"></span>
|
| - </div>
|
| -</if>
|
| -<if expr="chromeos or _google_chrome or is_linux">
|
| - <div id="update-status-container" hidden>
|
| - <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>
|
| -<if expr="is_macosx">
|
| - <div id="update-obsolete-system-container" hidden>
|
| - <span id="update-obsolete-system"
|
| - i18n-content="updateObsoleteSystem"></span>
|
| - <a i18n-values="href:updateObsoleteSystemURL"
|
| - i18n-content="learnMore" target="_blank"></a>
|
| - </div>
|
| </if>
|
| - <div id="allowed-connection-types-message" hidden></div>
|
| - </div>
|
| + <div id="mainview-content">
|
| + <div id="page-container">
|
| + <div id="help-page" class="page">
|
| + <include src="help_content.html">
|
| </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>
|
| -<if expr="chromeos">
|
| - <button id="relaunch-and-powerwash"
|
| - i18n-content="relaunchAndPowerwash" hidden>
|
| - </button>
|
| -</if>
|
| - </div>
|
| -</if>
|
| -<if expr="chromeos">
|
| - <div id="more-info-container">
|
| - <section id="channel-changer-container" hidden>
|
| - <h3 i18n-content="channel"></h3>
|
| - <select id="channel-changer">
|
| - <option value="stable-channel" i18n-content="stable"></option>
|
| - <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 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>
|
| - </section>
|
| - <section>
|
| - <h3 i18n-content="jsEngine" dir="ltr"></h3>
|
| - <div i18n-content="jsEngineVersion"></div>
|
| - </section>
|
| - <section>
|
| - <h3 i18n-content="userAgent"></h3>
|
| - <div i18n-content="userAgentInfo" dir="ltr"></div>
|
| - </section>
|
| - <section>
|
| - <h3 i18n-content="commandLine"></h3>
|
| - <div i18n-content="commandLineInfo" dir="ltr"></div>
|
| - </section>
|
| - <section id="build-date-container" class="empty">
|
| - <h3 i18n-content="buildDate"></h3>
|
| - <div id="build-date"></div>
|
| - </section>
|
| - </div>
|
| - <button id="more-info-expander" class="link-button"
|
| - i18n-content="showMoreInfo">
|
| - </button>
|
| -</if>
|
| - </div>
|
| - <div id="product-container">
|
| - <div i18n-content="productName"></div>
|
| - <div i18n-content="productCopyright"></div>
|
| - <div id="product-license"></div>
|
| -<if expr="chromeos">
|
| - <div id="product-os-license"></div>
|
| -</if>
|
| -<if expr="_google_chrome">
|
| - <div id="product-tos"></div>
|
| -</if>
|
| </div>
|
| </div>
|
| </body>
|
|
|