Chromium Code Reviews

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

Issue 2958003: First cut at adding the Languages and Input options sub page. (Closed)
Patch Set: make it a comment Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « chrome/browser/dom_ui/options_ui.cc ('k') | chrome/browser/resources/options/chromeos_language_options.html » ('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>
(...skipping 27 matching lines...)
38 } 38 }
39 OptionsPage.register(BrowserOptions.getInstance()); 39 OptionsPage.register(BrowserOptions.getInstance());
40 OptionsPage.register(PersonalOptions.getInstance()); 40 OptionsPage.register(PersonalOptions.getInstance());
41 OptionsPage.register(AdvancedOptions.getInstance()); 41 OptionsPage.register(AdvancedOptions.getInstance());
42 OptionsPage.register(ContentSettings.getInstance()); 42 OptionsPage.register(ContentSettings.getInstance());
43 if (cr.isChromeOS) { 43 if (cr.isChromeOS) {
44 var labsOptions = new OptionsPage('labs', 44 var labsOptions = new OptionsPage('labs',
45 localStrings.getString('labsPage'), 45 localStrings.getString('labsPage'),
46 'labsPage'); 46 'labsPage');
47 OptionsPage.register(labsOptions); 47 OptionsPage.register(labsOptions);
48 var languageSettings = new OptionsPage('language',
49 localStrings.getString(
50 'languagePage'),
51 'languagePage');
52 OptionsPage.registerSubPage(languageSettings);
48 } 53 }
49 54
50 var syncSettings = new OptionsPage('sync', 55 var syncSettings = new OptionsPage('sync',
51 localStrings.getString('syncPage'), 56 localStrings.getString('syncPage'),
52 'syncPage'); 57 'syncPage');
53 OptionsPage.registerSubPage(syncSettings); 58 OptionsPage.registerSubPage(syncSettings);
54 59
55 var dummyPage = new OptionsPage('dummy', 'Overlay Test Page', 'dummyPage'); 60 var dummyPage = new OptionsPage('dummy', 'Overlay Test Page', 'dummyPage');
56 OptionsPage.registerOverlay(dummyPage); 61 OptionsPage.registerOverlay(dummyPage);
57 62
(...skipping 33 matching lines...)
91 <h1 id="settings-title" i18n-content="title"></h1> 96 <h1 id="settings-title" i18n-content="title"></h1>
92 <ul id="navbar"> 97 <ul id="navbar">
93 </ul> 98 </ul>
94 <hr/> 99 <hr/>
95 <ul id="subpagesnav"> 100 <ul id="subpagesnav">
96 </ul> 101 </ul>
97 </div> 102 </div>
98 <div id="mainview"> 103 <div id="mainview">
99 <if expr="pp_ifdef('chromeos')"> 104 <if expr="pp_ifdef('chromeos')">
100 <include src="options/chromeos_system_options.html"> 105 <include src="options/chromeos_system_options.html">
106 <include src="options/chromeos_language_options.html">
101 <include src="options/chromeos_labs.html"> 107 <include src="options/chromeos_labs.html">
102 <include src="options/sync_options.html" > 108 <include src="options/sync_options.html" >
103 </if> 109 </if>
104 <include src="options/browser_options.html"> 110 <include src="options/browser_options.html">
105 <include src="options/personal_options.html"> 111 <include src="options/personal_options.html">
106 <include src="options/advanced_options.html"> 112 <include src="options/advanced_options.html">
107 <include src="options/content_settings.html"> 113 <include src="options/content_settings.html">
108 </div> 114 </div>
109 </div> 115 </div>
110 <script> 116 <script>
111 // Decorate the existing elements in the document. 117 // Decorate the existing elements in the document.
112 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox); 118 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox);
113 cr.ui.decorate('input[pref][type=range]', PrefRange); 119 cr.ui.decorate('input[pref][type=range]', PrefRange);
114 cr.ui.decorate('select[pref]', PrefSelect); 120 cr.ui.decorate('select[pref]', PrefSelect);
115 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio); 121 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio);
116 // TODO(zelidrag) add other elements here when we implement them 122 // TODO(zelidrag) add other elements here when we implement them
117 </script> 123 </script>
118 </body> 124 </body>
119 </html> 125 </html>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options_ui.cc ('k') | chrome/browser/resources/options/chromeos_language_options.html » ('j') | no next file with comments »

Powered by Google App Engine