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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side 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, 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 unified diff | Download patch | Annotate | Revision Log
« 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML> 1 <!DOCTYPE HTML>
2 <html i18n-values="dir:textdirection;" id="t"> 2 <html i18n-values="dir:textdirection;" id="t">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <title i18n-content="title"></title> 5 <title i18n-content="title"></title>
6 6
7 <!-- TODO(zelidrag) need a better icon here --> 7 <!-- TODO(zelidrag) need a better icon here -->
8 <link rel="icon" href="../../app/theme/history_favicon.png"> 8 <link rel="icon" href="../../app/theme/history_favicon.png">
9 9
10 <script src="chrome://resources/js/class_list.js"></script> 10 <script src="chrome://resources/js/class_list.js"></script>
11 <script src="chrome://resources/js/cr.js"></script> 11 <script src="chrome://resources/js/cr.js"></script>
12 <script src="chrome://resources/js/cr/event_target.js"></script> 12 <script src="chrome://resources/js/cr/event_target.js"></script>
13 <script src="chrome://resources/js/cr/ui.js"></script> 13 <script src="chrome://resources/js/cr/ui.js"></script>
14 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script> 14 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
15 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script> 15 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>
16 <script src="chrome://resources/js/cr/ui/list_item.js"></script> 16 <script src="chrome://resources/js/cr/ui/list_item.js"></script>
17 <script src="chrome://resources/js/cr/ui/list.js"></script> 17 <script src="chrome://resources/js/cr/ui/list.js"></script>
18 <script src="chrome://resources/js/local_strings.js"></script> 18 <script src="chrome://resources/js/local_strings.js"></script>
19 <script src="chrome://resources/js/util.js"></script> 19 <script src="chrome://resources/js/util.js"></script>
20 <script src="options/preferences.js"></script> 20 <script src="options/preferences.js"></script>
21 <script src="options/pref_ui.js"></script> 21 <script src="options/pref_ui.js"></script>
22 <script src="options/options_page.js"></script> 22 <script src="options/options_page.js"></script>
23 <if expr="pp_ifdef('chromeos')"> 23 <if expr="pp_ifdef('chromeos')">
24 <script src="options/chromeos_internet_network_list.js"></script>
25 <script src="options/chromeos_internet_options.js"></script>
24 <script src="options/chromeos_language_list.js"></script> 26 <script src="options/chromeos_language_list.js"></script>
25 <script src="options/chromeos_language_options.js"></script> 27 <script src="options/chromeos_language_options.js"></script>
26 <script src="options/chromeos_system_options.js"></script> 28 <script src="options/chromeos_system_options.js"></script>
27 <script src="options/chromeos_accounts_options.js"></script> 29 <script src="options/chromeos_accounts_options.js"></script>
28 <script src="options/chromeos_accounts_user_list.js"></script> 30 <script src="options/chromeos_accounts_user_list.js"></script>
29 <script src="options/chromeos_accounts_add_user_overlay.js"></script> 31 <script src="options/chromeos_accounts_add_user_overlay.js"></script>
30 </if> 32 </if>
31 <script src="options/advanced_options.js"></script> 33 <script src="options/advanced_options.js"></script>
32 <script src="options/browser_options.js"></script> 34 <script src="options/browser_options.js"></script>
33 <script src="options/personal_options.js"></script> 35 <script src="options/personal_options.js"></script>
34 <script src="options/content_settings_ui.js"></script> 36 <script src="options/content_settings_ui.js"></script>
35 <script src="options/content_settings.js"></script> 37 <script src="options/content_settings.js"></script>
36 <script src="options/add_startup_page_overlay.js"></script> 38 <script src="options/add_startup_page_overlay.js"></script>
37 <script src="options/clear_browser_data_overlay.js"></script> 39 <script src="options/clear_browser_data_overlay.js"></script>
38 <script src="options/font_settings_overlay.js"></script> 40 <script src="options/font_settings_overlay.js"></script>
39 <script> 41 <script>
40 42
41 /////////////////////////////////////////////////////////////////////////////// 43 ///////////////////////////////////////////////////////////////////////////////
42 // Document Functions: 44 // Document Functions:
43 /** 45 /**
44 * Window onload handler, sets up the page. 46 * Window onload handler, sets up the page.
45 */ 47 */
46 function load() { 48 function load() {
47 localStrings = new LocalStrings(); 49 localStrings = new LocalStrings();
48 50
49 if (cr.isChromeOS) { 51 if (cr.isChromeOS) {
50 OptionsPage.register(SystemOptions.getInstance()); 52 OptionsPage.register(SystemOptions.getInstance());
53 OptionsPage.register(InternetOptions.getInstance());
51 OptionsPage.register(AccountsOptions.getInstance()); 54 OptionsPage.register(AccountsOptions.getInstance());
52 // TODO(mazda): uncomment this once the language options is ready 55 // TODO(mazda): uncomment this once the language options is ready
53 // OptionsPage.register(new OptionsPage( 56 // OptionsPage.register(new OptionsPage(
54 // 'languageChewing', 57 // 'languageChewing',
55 // localStrings.getString('languageChewingPage'), 58 // localStrings.getString('languageChewingPage'),
56 // 'languageChewingPage')); 59 // 'languageChewingPage'));
57 // OptionsPage.register(new OptionsPage( 60 // OptionsPage.register(new OptionsPage(
58 // 'languageHangul', 61 // 'languageHangul',
59 // localStrings.getString('languageHangulPage'), 62 // localStrings.getString('languageHangulPage'),
60 // 'languageHangulPage')); 63 // 'languageHangulPage'));
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
100 103
101 </script> 104 </script>
102 <link rel="stylesheet" href="chrome://resources/css/list.css"> 105 <link rel="stylesheet" href="chrome://resources/css/list.css">
103 <link rel="stylesheet" href="dom_ui.css"> 106 <link rel="stylesheet" href="dom_ui.css">
104 <link rel="stylesheet" href="options/options_page.css"> 107 <link rel="stylesheet" href="options/options_page.css">
105 <link rel="stylesheet" href="options/browser_options_page.css"> 108 <link rel="stylesheet" href="options/browser_options_page.css">
106 <link rel="stylesheet" href="options/content_settings_page.css"> 109 <link rel="stylesheet" href="options/content_settings_page.css">
107 <link rel="stylesheet" href="options/clear_browser_data_overlay.css"> 110 <link rel="stylesheet" href="options/clear_browser_data_overlay.css">
108 <if expr="pp_ifdef('chromeos')"> 111 <if expr="pp_ifdef('chromeos')">
109 <link rel="stylesheet" href="options/chromeos_accounts_options_page.css"> 112 <link rel="stylesheet" href="options/chromeos_accounts_options_page.css">
113 <link rel="stylesheet" href="options/chromeos_internet_options_page.css">
110 <link rel="stylesheet" href="options/chromeos_language_options.css"> 114 <link rel="stylesheet" href="options/chromeos_language_options.css">
111 </if> 115 </if>
112 <link rel="stylesheet" href="options/personal_options.css"> 116 <link rel="stylesheet" href="options/personal_options.css">
113 </head> 117 </head>
114 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 118 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
115 <div class="header"> 119 <div class="header">
116 </div> 120 </div>
117 <div id="overlay" class="overlay hidden"> 121 <div id="overlay" class="overlay hidden">
118 <div id="overlayview"> 122 <div id="overlayview">
119 <include src="options/add_startup_page_overlay.html"> 123 <include src="options/add_startup_page_overlay.html">
120 <include src="options/clear_browser_data_overlay.html"> 124 <include src="options/clear_browser_data_overlay.html">
121 <include src="options/font_settings_overlay.html"> 125 <include src="options/font_settings_overlay.html">
122 <if expr="pp_ifdef('chromeos')"> 126 <if expr="pp_ifdef('chromeos')">
123 <include src="options/chromeos_accounts_add_user_overlay.html"> 127 <include src="options/chromeos_accounts_add_user_overlay.html">
124 </if> 128 </if>
125 </div> 129 </div>
126 </div> 130 </div>
127 <div id="main-content"> 131 <div id="main-content">
128 <div id="navbar-container"> 132 <div id="navbar-container">
129 <h1 id="settings-title" i18n-content="title"></h1> 133 <h1 id="settings-title" i18n-content="title"></h1>
130 <ul id="navbar"> 134 <ul id="navbar">
131 </ul> 135 </ul>
132 <hr/> 136 <hr/>
133 <ul id="subpagesnav"> 137 <ul id="subpagesnav">
134 </ul> 138 </ul>
135 </div> 139 </div>
136 <div id="mainview"> 140 <div id="mainview">
137 <if expr="pp_ifdef('chromeos')"> 141 <if expr="pp_ifdef('chromeos')">
138 <include src="options/chromeos_system_options.html"> 142 <include src="options/chromeos_system_options.html">
143 <include src="options/chromeos_internet_options.html">
139 <include src="options/chromeos_language_options.html"> 144 <include src="options/chromeos_language_options.html">
140 <include src="options/chromeos_labs.html"> 145 <include src="options/chromeos_labs.html">
141 <include src="options/chromeos_accounts_options.html"> 146 <include src="options/chromeos_accounts_options.html">
142 <!-- TODO(mazda): include the following htmls once the language options 147 <!-- TODO(mazda): include the following htmls once the language options
143 dialog is ready. 148 dialog is ready.
144 - options/chromeos_language_chewing_options.html 149 - options/chromeos_language_chewing_options.html
145 - options/chromeos_language_hangul_options.html 150 - options/chromeos_language_hangul_options.html
146 - options/chromeos_language_pinyin_options.html 151 - options/chromeos_language_pinyin_options.html
147 --> 152 -->
148 </if> 153 </if>
(...skipping 11 matching lines...) Expand all
160 cr.ui.decorate('input[pref][type=number]', PrefNumber); 165 cr.ui.decorate('input[pref][type=number]', PrefNumber);
161 cr.ui.decorate('input[pref][type=radio]', PrefRadio); 166 cr.ui.decorate('input[pref][type=radio]', PrefRadio);
162 cr.ui.decorate('input[pref][type=range]', PrefRange); 167 cr.ui.decorate('input[pref][type=range]', PrefRange);
163 cr.ui.decorate('select[pref]', PrefSelect); 168 cr.ui.decorate('select[pref]', PrefSelect);
164 cr.ui.decorate('input[pref][type=url]', PrefTextField); 169 cr.ui.decorate('input[pref][type=url]', PrefTextField);
165 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio); 170 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio);
166 // TODO(zelidrag) add other elements here when we implement them 171 // TODO(zelidrag) add other elements here when we implement them
167 </script> 172 </script>
168 </body> 173 </body>
169 </html> 174 </html>
OLDNEW
« 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