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

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

Issue 3036020: Port network options to DOM UI. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 5 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
Index: chrome/browser/resources/options.html
===================================================================
--- chrome/browser/resources/options.html (revision 53638)
+++ chrome/browser/resources/options.html (working copy)
@@ -21,6 +21,8 @@
<script src="options/pref_ui.js"></script>
<script src="options/options_page.js"></script>
<if expr="pp_ifdef('chromeos')">
+ <script src="options/chromeos_internet_network_list.js"></script>
+ <script src="options/chromeos_internet_options.js"></script>
<script src="options/chromeos_language_list.js"></script>
<script src="options/chromeos_language_options.js"></script>
<script src="options/chromeos_system_options.js"></script>
@@ -48,6 +50,7 @@
if (cr.isChromeOS) {
OptionsPage.register(SystemOptions.getInstance());
+ OptionsPage.register(InternetOptions.getInstance());
OptionsPage.register(AccountsOptions.getInstance());
// TODO(mazda): uncomment this once the language options is ready
// OptionsPage.register(new OptionsPage(
@@ -107,6 +110,7 @@
<link rel="stylesheet" href="options/clear_browser_data_overlay.css">
<if expr="pp_ifdef('chromeos')">
<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">
</if>
<link rel="stylesheet" href="options/personal_options.css">
@@ -136,6 +140,7 @@
<div id="mainview">
<if expr="pp_ifdef('chromeos')">
<include src="options/chromeos_system_options.html">
+ <include src="options/chromeos_internet_options.html">
<include src="options/chromeos_language_options.html">
<include src="options/chromeos_labs.html">
<include src="options/chromeos_accounts_options.html">
« no previous file with comments | « chrome/browser/dom_ui/options_ui.cc ('k') | chrome/browser/resources/options/chromeos_internet_network_list.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698