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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/resources/options.html

Issue 5519001: DOMUI prefs: Re-order sections in the sidebar (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change default on Chrome OS Created 10 years 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 | « no previous file | no next file » | 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 2 <html
3 i18n-values="dir:textdirection; 3 i18n-values="dir:textdirection;
4 enable-cloud-print-proxy:enable-cloud-print-proxy" 4 enable-cloud-print-proxy:enable-cloud-print-proxy"
5 id="t"> 5 id="t">
6 <head> 6 <head>
7 <meta charset="utf-8"> 7 <meta charset="utf-8">
8 <title i18n-content="title"></title> 8 <title i18n-content="title"></title>
9 9
10 <link rel="icon" href="../../app/theme/settings_favicon.png"> 10 <link rel="icon" href="../../app/theme/settings_favicon.png">
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 */ 157 */
158 function load() { 158 function load() {
159 var start = new Date(); 159 var start = new Date();
160 160
161 var menuOffPattern = /(^\?|&)menu=off($|&)/; 161 var menuOffPattern = /(^\?|&)menu=off($|&)/;
162 var menuDisabled = menuOffPattern.test(window.location.search); 162 var menuDisabled = menuOffPattern.test(window.location.search);
163 document.documentElement.setAttribute('hide-menu', menuDisabled); 163 document.documentElement.setAttribute('hide-menu', menuDisabled);
164 164
165 localStrings = new LocalStrings(); 165 localStrings = new LocalStrings();
166 166
167 OptionsPage.register(SearchPage.getInstance());
168 OptionsPage.register(BrowserOptions.getInstance());
169 OptionsPage.registerSubPage(SearchEngineManager.getInstance(),
170 BrowserOptions.getInstance());
171 OptionsPage.register(PersonalOptions.getInstance());
172 OptionsPage.registerSubPage(AutoFillOptions.getInstance(),
173 PersonalOptions.getInstance());
174 OptionsPage.registerSubPage(PasswordsExceptions.getInstance(),
175 PersonalOptions.getInstance());
176 OptionsPage.registerSubPage(SyncOptions.getInstance(),
177 PersonalOptions.getInstance());
167 if (cr.isChromeOS) { 178 if (cr.isChromeOS) {
168 OptionsPage.register(SystemOptions.getInstance()); 179 OptionsPage.register(SystemOptions.getInstance());
169 OptionsPage.registerSubPage(AboutPage.getInstance(), 180 OptionsPage.registerSubPage(AboutPage.getInstance(),
170 SystemOptions.getInstance()); 181 SystemOptions.getInstance());
171 OptionsPage.registerSubPage(LanguageOptions.getInstance(), 182 OptionsPage.registerSubPage(LanguageOptions.getInstance(),
172 SystemOptions.getInstance()); 183 SystemOptions.getInstance());
173 OptionsPage.registerSubPage( 184 OptionsPage.registerSubPage(
174 new OptionsPage('languageChewing', 185 new OptionsPage('languageChewing',
175 localStrings.getString('languageChewingPage'), 186 localStrings.getString('languageChewingPage'),
176 'languageChewingPage'), 187 'languageChewingPage'),
177 SystemOptions.getInstance()); 188 SystemOptions.getInstance());
178 OptionsPage.registerSubPage( 189 OptionsPage.registerSubPage(
179 new OptionsPage('languageHangul', 190 new OptionsPage('languageHangul',
180 localStrings.getString('languageHangulPage'), 191 localStrings.getString('languageHangulPage'),
181 'languageHangulPage'), 192 'languageHangulPage'),
182 SystemOptions.getInstance()); 193 SystemOptions.getInstance());
183 OptionsPage.registerSubPage( 194 OptionsPage.registerSubPage(
184 new OptionsPage('languageMozc', 195 new OptionsPage('languageMozc',
185 localStrings.getString('languageMozcPage'), 196 localStrings.getString('languageMozcPage'),
186 'languageMozcPage'), 197 'languageMozcPage'),
187 SystemOptions.getInstance()); 198 SystemOptions.getInstance());
188 OptionsPage.registerSubPage( 199 OptionsPage.registerSubPage(
189 new OptionsPage('languagePinyin', 200 new OptionsPage('languagePinyin',
190 localStrings.getString('languagePinyinPage'), 201 localStrings.getString('languagePinyinPage'),
191 'languagePinyinPage'), 202 'languagePinyinPage'),
192 SystemOptions.getInstance()); 203 SystemOptions.getInstance());
193 OptionsPage.register(InternetOptions.getInstance()); 204 OptionsPage.register(InternetOptions.getInstance());
194 } 205 }
195
196 OptionsPage.register(SearchPage.getInstance());
197 OptionsPage.register(BrowserOptions.getInstance());
198 OptionsPage.registerSubPage(SearchEngineManager.getInstance(),
199 BrowserOptions.getInstance());
200 OptionsPage.register(PersonalOptions.getInstance());
201 OptionsPage.registerSubPage(AutoFillOptions.getInstance(),
202 PersonalOptions.getInstance());
203 OptionsPage.registerSubPage(PasswordsExceptions.getInstance(),
204 PersonalOptions.getInstance());
205 OptionsPage.registerSubPage(SyncOptions.getInstance(),
206 PersonalOptions.getInstance());
207 OptionsPage.register(AdvancedOptions.getInstance()); 206 OptionsPage.register(AdvancedOptions.getInstance());
208 OptionsPage.registerSubPage(ContentSettings.getInstance(), 207 OptionsPage.registerSubPage(ContentSettings.getInstance(),
209 AdvancedOptions.getInstance()); 208 AdvancedOptions.getInstance());
210 OptionsPage.registerSubPage(CookiesView.getInstance(), 209 OptionsPage.registerSubPage(CookiesView.getInstance(),
211 AdvancedOptions.getInstance()); 210 AdvancedOptions.getInstance());
212 OptionsPage.registerSubPage(FontSettings.getInstance(), 211 OptionsPage.registerSubPage(FontSettings.getInstance(),
213 AdvancedOptions.getInstance()); 212 AdvancedOptions.getInstance());
214 if (!cr.isWindows && !cr.isMac) { 213 if (!cr.isWindows && !cr.isMac) {
215 OptionsPage.registerSubPage(CertificateManager.getInstance(), 214 OptionsPage.registerSubPage(CertificateManager.getInstance(),
216 AdvancedOptions.getInstance()); 215 AdvancedOptions.getInstance());
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 var path = document.location.pathname; 249 var path = document.location.pathname;
251 var hash = document.location.hash; 250 var hash = document.location.hash;
252 251
253 if (path.length > 1) { 252 if (path.length > 1) {
254 var pageName = path.slice(1); 253 var pageName = path.slice(1);
255 OptionsPage.showPageByName(pageName); 254 OptionsPage.showPageByName(pageName);
256 if (hash.length > 1) 255 if (hash.length > 1)
257 OptionsPage.handleHashForPage(pageName, hash.slice(1)); 256 OptionsPage.handleHashForPage(pageName, hash.slice(1));
258 } else { 257 } else {
259 // TODO(csilv): Save/restore last selected page. 258 // TODO(csilv): Save/restore last selected page.
260 if (cr.isChromeOS) { 259 OptionsPage.showPageByName(BrowserOptions.getInstance().name);
261 OptionsPage.showPageByName(SystemOptions.getInstance().name);
262 } else {
263 OptionsPage.showPageByName(BrowserOptions.getInstance().name);
264 }
265 } 260 }
266 261
267 var subpagesNavTabs = document.querySelectorAll('.subpages-nav-tabs'); 262 var subpagesNavTabs = document.querySelectorAll('.subpages-nav-tabs');
268 for(var i = 0; i < subpagesNavTabs.length; i++) { 263 for(var i = 0; i < subpagesNavTabs.length; i++) {
269 subpagesNavTabs[i].onclick = function(event) { 264 subpagesNavTabs[i].onclick = function(event) {
270 OptionsPage.showTab(event.srcElement); 265 OptionsPage.showTab(event.srcElement);
271 } 266 }
272 } 267 }
273 268
274 // Allow platform specific CSS rules. 269 // Allow platform specific CSS rules.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 <div id="mainview-content"> 325 <div id="mainview-content">
331 <!-- Start main pages --> 326 <!-- Start main pages -->
332 <!-- Please keep the main pages in desired order of display. This will 327 <!-- Please keep the main pages in desired order of display. This will
333 allow search results to display in the desired order. --> 328 allow search results to display in the desired order. -->
334 <include src="options/search_page.html"> 329 <include src="options/search_page.html">
335 <if expr="pp_ifdef('chromeos')"> 330 <if expr="pp_ifdef('chromeos')">
336 <include src="options/chromeos_system_options.html"> 331 <include src="options/chromeos_system_options.html">
337 <include src="options/chromeos_internet_options.html"> 332 <include src="options/chromeos_internet_options.html">
338 <include src="options/chromeos_accounts_options.html"> 333 <include src="options/chromeos_accounts_options.html">
339 </if> 334 </if>
340 <include src="options/browser_options.html"> 335 <include src="options/browser_options.html">
csilv 2010/12/02 00:09:59 Please move include for browser_options.html and p
stuartmorgan 2010/12/02 00:29:14 Done.
341 <include src="options/personal_options.html"> 336 <include src="options/personal_options.html">
342 <include src="options/advanced_options.html"> 337 <include src="options/advanced_options.html">
343 <!-- End main pages --> 338 <!-- End main pages -->
344 <div id="subpage-sheet-container" class="hidden"> 339 <div id="subpage-sheet-container" class="hidden">
345 <div id="subpage-sheet"> 340 <div id="subpage-sheet">
346 <if expr="pp_ifdef('chromeos')"> 341 <if expr="pp_ifdef('chromeos')">
347 <include src="options/about_page.html"> 342 <include src="options/about_page.html">
348 <include src="options/chromeos_language_options.html"> 343 <include src="options/chromeos_language_options.html">
349 <include src="options/chromeos_language_chewing_options.html"> 344 <include src="options/chromeos_language_chewing_options.html">
350 <include src="options/chromeos_language_hangul_options.html"> 345 <include src="options/chromeos_language_hangul_options.html">
(...skipping 27 matching lines...) Expand all
378 cr.ui.decorate('input[pref][type=text]', options.PrefTextField); 373 cr.ui.decorate('input[pref][type=text]', options.PrefTextField);
379 cr.ui.decorate('input[pref][type=url]', options.PrefTextField); 374 cr.ui.decorate('input[pref][type=url]', options.PrefTextField);
380 cr.ui.decorate('#contentSettingsPage input[type=radio]', 375 cr.ui.decorate('#contentSettingsPage input[type=radio]',
381 options.ContentSettingsRadio); 376 options.ContentSettingsRadio);
382 cr.ui.decorate('#fontSettingsMinimumSizeSelector', 377 cr.ui.decorate('#fontSettingsMinimumSizeSelector',
383 options.MinimumFontSizeSelect); 378 options.MinimumFontSizeSelect);
384 console.log('in bottom script'); 379 console.log('in bottom script');
385 </script> 380 </script>
386 </body> 381 </body>
387 </html> 382 </html>
OLDNEW
« 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