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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 449623003: Integrate About page into Settings for Chrome OS settings in a window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: About in Settings Created 6 years, 4 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
« chrome/browser/resources/options/browser_options.css ('K') | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/resources/options/options.js » ('j') | chrome/browser/ui/webui/options/help_overlay_handler.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/options.html
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index fac61edaf61af9bee1a13d703c43f52535e2b62b..faf83e585a4515a3ab04de2863a8d22c1644dbfe 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -62,6 +62,8 @@
<link rel="stylesheet" href="chromeos/keyboard_overlay.css">
<link rel="stylesheet" href="chromeos/pointer_overlay.css">
<link rel="stylesheet" href="factory_reset_overlay.css">
+<link rel="stylesheet" href="../help/help_content.css">
+<link rel="stylesheet" href="../help/channel_change_page.css">
</if>
<if expr="use_nss">
<link rel="stylesheet" href="certificate_manager.css">
@@ -105,8 +107,7 @@
<script src="chrome://settings-frame/options_bundle.js"></script>
</head>
-<body class="uber-frame"
- i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
+<body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
<div id="overlay-container-1" class="overlay transparent" hidden>
<include src="autofill_options.html">
<include src="clear_browser_data_overlay.html">
@@ -136,6 +137,7 @@
<include src="chromeos/keyboard_overlay.html">
<include src="chromeos/pointer_overlay.html">
<include src="factory_reset_overlay.html">
+ <include src="../help/help_page.html">
</if>
<if expr="use_nss">
<include src="certificate_manager.html">
@@ -159,6 +161,7 @@
<include src="chromeos/internet_detail.html">
<include src="chromeos/preferred_networks.html">
<include src="chromeos/third_party_ime_confirm_overlay.html">
+ <include src="../help/channel_change_page.html">
</if>
<if expr="not is_win and not is_macosx">
<include src="certificate_restore_overlay.html">
@@ -167,8 +170,6 @@
<include src="certificate_import_error_overlay.html">
</if>
</div>
-<div id="overlay-container-3" class="overlay transparent" hidden>
-</div>
<div id="extension-controlled-settings-bubble-template" hidden>
<div class="controlled-setting-bubble-content-row">
<div class="controlled-setting-bubble-extension-name"></div>
« chrome/browser/resources/options/browser_options.css ('K') | « chrome/browser/resources/options/browser_options.js ('k') | chrome/browser/resources/options/options.js » ('j') | chrome/browser/ui/webui/options/help_overlay_handler.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698