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

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: Move includes 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 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
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()); 167 OptionsPage.register(SearchPage.getInstance());
168 168
169 OptionsPage.register(BrowserOptions.getInstance());
170 OptionsPage.registerSubPage(SearchEngineManager.getInstance(),
171 BrowserOptions.getInstance());
172 OptionsPage.register(PersonalOptions.getInstance());
173 OptionsPage.registerSubPage(AutoFillOptions.getInstance(),
174 PersonalOptions.getInstance());
175 OptionsPage.registerSubPage(PasswordsExceptions.getInstance(),
176 PersonalOptions.getInstance());
177 OptionsPage.registerSubPage(SyncOptions.getInstance(),
178 PersonalOptions.getInstance());
169 if (cr.isChromeOS) { 179 if (cr.isChromeOS) {
170 OptionsPage.register(SystemOptions.getInstance()); 180 OptionsPage.register(SystemOptions.getInstance());
171 OptionsPage.registerSubPage(AboutPage.getInstance(), 181 OptionsPage.registerSubPage(AboutPage.getInstance(),
172 SystemOptions.getInstance()); 182 SystemOptions.getInstance());
173 OptionsPage.registerSubPage(LanguageOptions.getInstance(), 183 OptionsPage.registerSubPage(LanguageOptions.getInstance(),
174 SystemOptions.getInstance()); 184 SystemOptions.getInstance());
175 OptionsPage.registerSubPage( 185 OptionsPage.registerSubPage(
176 new OptionsPage('languageChewing', 186 new OptionsPage('languageChewing',
177 localStrings.getString('languageChewingPage'), 187 localStrings.getString('languageChewingPage'),
178 'languageChewingPage'), 188 'languageChewingPage'),
179 SystemOptions.getInstance()); 189 SystemOptions.getInstance());
180 OptionsPage.registerSubPage( 190 OptionsPage.registerSubPage(
181 new OptionsPage('languageHangul', 191 new OptionsPage('languageHangul',
182 localStrings.getString('languageHangulPage'), 192 localStrings.getString('languageHangulPage'),
183 'languageHangulPage'), 193 'languageHangulPage'),
184 SystemOptions.getInstance()); 194 SystemOptions.getInstance());
185 OptionsPage.registerSubPage( 195 OptionsPage.registerSubPage(
186 new OptionsPage('languageMozc', 196 new OptionsPage('languageMozc',
187 localStrings.getString('languageMozcPage'), 197 localStrings.getString('languageMozcPage'),
188 'languageMozcPage'), 198 'languageMozcPage'),
189 SystemOptions.getInstance()); 199 SystemOptions.getInstance());
190 OptionsPage.registerSubPage( 200 OptionsPage.registerSubPage(
191 new OptionsPage('languagePinyin', 201 new OptionsPage('languagePinyin',
192 localStrings.getString('languagePinyinPage'), 202 localStrings.getString('languagePinyinPage'),
193 'languagePinyinPage'), 203 'languagePinyinPage'),
194 SystemOptions.getInstance()); 204 SystemOptions.getInstance());
195 OptionsPage.register(InternetOptions.getInstance()); 205 OptionsPage.register(InternetOptions.getInstance());
196 } 206 }
197
198 OptionsPage.register(BrowserOptions.getInstance());
199 OptionsPage.registerSubPage(SearchEngineManager.getInstance(),
200 BrowserOptions.getInstance());
201 OptionsPage.register(PersonalOptions.getInstance());
202 OptionsPage.registerSubPage(AutoFillOptions.getInstance(),
203 PersonalOptions.getInstance());
204 OptionsPage.registerSubPage(PasswordsExceptions.getInstance(),
205 PersonalOptions.getInstance());
206 OptionsPage.registerSubPage(SyncOptions.getInstance(),
207 PersonalOptions.getInstance());
208 OptionsPage.register(AdvancedOptions.getInstance()); 207 OptionsPage.register(AdvancedOptions.getInstance());
209 OptionsPage.registerSubPage(ContentSettings.getInstance(), 208 OptionsPage.registerSubPage(ContentSettings.getInstance(),
210 AdvancedOptions.getInstance()); 209 AdvancedOptions.getInstance());
211 OptionsPage.registerSubPage(CookiesView.getInstance(), 210 OptionsPage.registerSubPage(CookiesView.getInstance(),
212 AdvancedOptions.getInstance()); 211 AdvancedOptions.getInstance());
213 OptionsPage.registerSubPage(FontSettings.getInstance(), 212 OptionsPage.registerSubPage(FontSettings.getInstance(),
214 AdvancedOptions.getInstance()); 213 AdvancedOptions.getInstance());
215 if (!cr.isWindows && !cr.isMac) { 214 if (!cr.isWindows && !cr.isMac) {
216 OptionsPage.registerSubPage(CertificateManager.getInstance(), 215 OptionsPage.registerSubPage(CertificateManager.getInstance(),
217 AdvancedOptions.getInstance()); 216 AdvancedOptions.getInstance());
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 var path = document.location.pathname; 250 var path = document.location.pathname;
252 var hash = document.location.hash; 251 var hash = document.location.hash;
253 252
254 if (path.length > 1) { 253 if (path.length > 1) {
255 var pageName = path.slice(1); 254 var pageName = path.slice(1);
256 OptionsPage.showPageByName(pageName); 255 OptionsPage.showPageByName(pageName);
257 if (hash.length > 1) 256 if (hash.length > 1)
258 OptionsPage.handleHashForPage(pageName, hash.slice(1)); 257 OptionsPage.handleHashForPage(pageName, hash.slice(1));
259 } else { 258 } else {
260 // TODO(csilv): Save/restore last selected page. 259 // TODO(csilv): Save/restore last selected page.
261 if (cr.isChromeOS) { 260 OptionsPage.showPageByName(BrowserOptions.getInstance().name);
262 OptionsPage.showPageByName(SystemOptions.getInstance().name);
263 } else {
264 OptionsPage.showPageByName(BrowserOptions.getInstance().name);
265 }
266 } 261 }
267 262
268 var subpagesNavTabs = document.querySelectorAll('.subpages-nav-tabs'); 263 var subpagesNavTabs = document.querySelectorAll('.subpages-nav-tabs');
269 for(var i = 0; i < subpagesNavTabs.length; i++) { 264 for(var i = 0; i < subpagesNavTabs.length; i++) {
270 subpagesNavTabs[i].onclick = function(event) { 265 subpagesNavTabs[i].onclick = function(event) {
271 OptionsPage.showTab(event.srcElement); 266 OptionsPage.showTab(event.srcElement);
272 } 267 }
273 } 268 }
274 269
275 // Allow platform specific CSS rules. 270 // Allow platform specific CSS rules.
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 <div class="hidden" id="managed-prefs-banner"> 321 <div class="hidden" id="managed-prefs-banner">
327 <span id="managed-prefs-icon"></span> 322 <span id="managed-prefs-icon"></span>
328 <span id="managed-prefs-text" 323 <span id="managed-prefs-text"
329 i18n-content="managedPrefsBannerText"></span> 324 i18n-content="managedPrefsBannerText"></span>
330 </div> 325 </div>
331 <div id="mainview-content"> 326 <div id="mainview-content">
332 <!-- Start main pages --> 327 <!-- Start main pages -->
333 <!-- Please keep the main pages in desired order of display. This will 328 <!-- Please keep the main pages in desired order of display. This will
334 allow search results to display in the desired order. --> 329 allow search results to display in the desired order. -->
335 <include src="options/search_page.html"> 330 <include src="options/search_page.html">
331 <include src="options/browser_options.html">
332 <include src="options/personal_options.html">
336 <if expr="pp_ifdef('chromeos')"> 333 <if expr="pp_ifdef('chromeos')">
337 <include src="options/chromeos_system_options.html"> 334 <include src="options/chromeos_system_options.html">
338 <include src="options/chromeos_internet_options.html"> 335 <include src="options/chromeos_internet_options.html">
339 <include src="options/chromeos_accounts_options.html"> 336 <include src="options/chromeos_accounts_options.html">
340 </if> 337 </if>
341 <include src="options/browser_options.html">
342 <include src="options/personal_options.html">
343 <include src="options/advanced_options.html"> 338 <include src="options/advanced_options.html">
344 <!-- End main pages --> 339 <!-- End main pages -->
345 <div id="subpage-sheet-container" class="hidden"> 340 <div id="subpage-sheet-container" class="hidden">
346 <div id="subpage-sheet"> 341 <div id="subpage-sheet">
347 <if expr="pp_ifdef('chromeos')"> 342 <if expr="pp_ifdef('chromeos')">
348 <include src="options/about_page.html"> 343 <include src="options/about_page.html">
349 <include src="options/chromeos_language_options.html"> 344 <include src="options/chromeos_language_options.html">
350 <include src="options/chromeos_language_chewing_options.html"> 345 <include src="options/chromeos_language_chewing_options.html">
351 <include src="options/chromeos_language_hangul_options.html"> 346 <include src="options/chromeos_language_hangul_options.html">
352 <include src="options/chromeos_language_mozc_options.html"> 347 <include src="options/chromeos_language_mozc_options.html">
(...skipping 26 matching lines...) Expand all
379 cr.ui.decorate('input[pref][type=text]', options.PrefTextField); 374 cr.ui.decorate('input[pref][type=text]', options.PrefTextField);
380 cr.ui.decorate('input[pref][type=url]', options.PrefTextField); 375 cr.ui.decorate('input[pref][type=url]', options.PrefTextField);
381 cr.ui.decorate('#contentSettingsPage input[type=radio]', 376 cr.ui.decorate('#contentSettingsPage input[type=radio]',
382 options.ContentSettingsRadio); 377 options.ContentSettingsRadio);
383 cr.ui.decorate('#fontSettingsMinimumSizeSelector', 378 cr.ui.decorate('#fontSettingsMinimumSizeSelector',
384 options.MinimumFontSizeSelect); 379 options.MinimumFontSizeSelect);
385 console.log('in bottom script'); 380 console.log('in bottom script');
386 </script> 381 </script>
387 </body> 382 </body>
388 </html> 383 </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