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

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

Issue 3170022: Moving about_page to chromeos only. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options.html
diff --git a/chrome/browser/resources/options.html b/chrome/browser/resources/options.html
index 5dfe1b7e591f403f25d8eeb6d9195a9e10c25519..f1c35fbd610ab8e6e9d42d672d20ad6d6fda29c4 100644
--- a/chrome/browser/resources/options.html
+++ b/chrome/browser/resources/options.html
@@ -23,6 +23,7 @@
<script src="options/pref_ui.js"></script>
<script src="options/options_page.js"></script>
<if expr="pp_ifdef('chromeos')">
+ <script src="options/about_page.js"></script>
<script src="options/chromeos_internet_network_element.js"></script>
<script src="options/chromeos_internet_options.js"></script>
<script src="options/chromeos_language_add_language_overlay.js"></script>
@@ -33,6 +34,7 @@
<script src="options/chromeos_accounts_user_list.js"></script>
<script src="options/chromeos_accounts_user_name_edit.js"></script>
<script>
+ var AboutPage = options.AboutPage;
var AccountsOptions = options.AccountsOptions;
var InternetOptions = options.InternetOptions;
var LanguageHangulOptions = options.LanguageHangulOptions;
@@ -40,7 +42,6 @@
var SystemOptions = options.SystemOptions;
</script>
</if>
-<script src="options/about_page.js"></script>
<script src="options/add_startup_page_overlay.js"></script>
<script src="options/advanced_options.js"></script>
<script src="options/autofill_options.js"></script>
@@ -58,7 +59,6 @@
<script src="options/stop_syncing_overlay.js"></script>
<script>
-var AboutPage = options.AboutPage;
var AddStartupPageOverlay = options.AddStartupPageOverlay;
var AdvancedOptions = options.AdvancedOptions;
var AutoFillOptions = options.AutoFillOptions;
@@ -81,11 +81,11 @@ function load() {
localStrings = new LocalStrings();
if (cr.isChromeOS) {
+ OptionsPage.registerSubPage(AboutPage.getInstance());
OptionsPage.register(SystemOptions.getInstance());
OptionsPage.register(InternetOptions.getInstance());
}
- OptionsPage.registerSubPage(AboutPage.getInstance());
OptionsPage.register(BrowserOptions.getInstance());
OptionsPage.register(PersonalOptions.getInstance());
OptionsPage.register(AdvancedOptions.getInstance());
@@ -166,7 +166,6 @@ window.onpopstate = function(e) {
<link rel="stylesheet" href="chrome://resources/css/list.css">
<link rel="stylesheet" href="dom_ui.css">
<link rel="stylesheet" href="options/options_page.css">
-<link rel="stylesheet" href="options/about_page.css">
<link rel="stylesheet" href="options/add_startup_page_overlay.css">
<link rel="stylesheet" href="options/autofill_options_page.css">
<link rel="stylesheet" href="options/browser_options_page.css">
@@ -177,6 +176,7 @@ window.onpopstate = function(e) {
<link rel="stylesheet" href="options/import_data_overlay.css">
<link rel="stylesheet" href="options/subpages_tab_controls.css">
<if expr="pp_ifdef('chromeos')">
+ <link rel="stylesheet" href="options/about_page.css">
<link rel="stylesheet" href="options/chromeos_accounts_options_page.css">
<link rel="stylesheet" href="options/chromeos_internet_options_page.css">
<link rel="stylesheet" href="options/chromeos_language_options.css">
@@ -206,6 +206,7 @@ window.onpopstate = function(e) {
</div>
<div id="mainview">
<if expr="pp_ifdef('chromeos')">
+ <include src="options/about_page.html">
<include src="options/chromeos_system_options.html">
<include src="options/chromeos_internet_options.html">
<include src="options/chromeos_language_options.html">
@@ -225,7 +226,6 @@ window.onpopstate = function(e) {
<include src="options/personal_options.html">
<include src="options/search_engine_manager.html">
<include src="options/sync_options.html">
- <include src="options/about_page.html">
</div>
</div>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698