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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2830036: Advanced (Under the Hood) options panel code review (Closed) Base URL: svn://svn.chromium.org/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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/dom_ui/personal_options_handler.cc ('k') | chrome/browser/resources/options/advanced_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>
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/local_strings.js"></script> 14 <script src="chrome://resources/js/local_strings.js"></script>
15 <script src="chrome://resources/js/util.js"></script> 15 <script src="chrome://resources/js/util.js"></script>
16 <script src="options/preferences.js"></script> 16 <script src="options/preferences.js"></script>
17 <script src="options/pref_ui.js"></script> 17 <script src="options/pref_ui.js"></script>
18 <script src="options/options_page.js"></script> 18 <script src="options/options_page.js"></script>
19 <if expr="pp_ifdef('chromeos')"> 19 <if expr="pp_ifdef('chromeos')">
20 <script src="options/chromeos_system_options.js"></script> 20 <script src="options/chromeos_system_options.js"></script>
21 </if> 21 </if>
22 <script src="options/advanced_options.js"></script>
23 <script src="options/browser_options.js"></script>
24 <script src="options/personal_options.js"></script>
22 <script> 25 <script>
23 26
24 /////////////////////////////////////////////////////////////////////////////// 27 ///////////////////////////////////////////////////////////////////////////////
25 // Document Functions: 28 // Document Functions:
26 /** 29 /**
27 * Window onload handler, sets up the page. 30 * Window onload handler, sets up the page.
28 */ 31 */
29 function load() { 32 function load() {
30 localStrings = new LocalStrings(); 33 localStrings = new LocalStrings();
31 OptionsPage.register(SystemOptions.getInstance()); 34
32 var labsOptions = new OptionsPage('labs', 35 const isChromeOS = /CrOS/.test(navigator.platform);
33 templateData.labsPage, 36 if (isChromeOS) {
34 'labsPage'); 37 OptionsPage.register(SystemOptions.getInstance());
35 OptionsPage.register(labsOptions); 38 }
39 OptionsPage.register(BrowserOptions.getInstance());
40 OptionsPage.register(PersonalOptions.getInstance());
41 OptionsPage.register(AdvancedOptions.getInstance());
36 42
37 Preferences.getInstance().initialize(); 43 Preferences.getInstance().initialize();
38 OptionsPage.showPageByName(SystemOptions.getInstance().name); 44 if (isChromeOS) {
45 OptionsPage.showPageByName(SystemOptions.getInstance().name);
46 } else {
47 OptionsPage.showPageByName(BrowserOptions.getInstance().name);
48 }
39 } 49 }
40 50
51 document.addEventListener('DOMContentLoaded', load);
41 52
42 window.onpopstate = function(e) { 53 window.onpopstate = function(e) {
43 OptionsPage.setState(e.state); 54 OptionsPage.setState(e.state);
44 }; 55 };
45 56
46 </script> 57 </script>
47 <link rel="stylesheet" href="dom_ui.css"> 58 <link rel="stylesheet" href="dom_ui.css">
48 <!-- TODO(zelidrag) just a temp style placeholder until redesign --> 59 <link rel="stylesheet" href="options/options_page.css">
49 <style>
50 #main-content {
51 display: -webkit-box;
52 }
53
54 #navbar-container {
55 border: 1px solid black;
56 background-color: #dfdfdf;
57 cursor: pointer;
58 font-weight: bold;
59 height: 400px;
60 padding: 10px;
61 position: relative;
62 width: 200px;
63 }
64
65 .navbar-item, .navbar-item2 {
66 margin: 5px;
67 padding: 5px;
68 }
69
70 .navbar-item-selected {
71 background-color: #FFFFFF;
72 }
73
74 .navbar-item-normal {
75 background-color: #dfdfdf;
76 }
77
78 #mainview {
79 -webkit-box-align: stretch;
80 border: 1px solid black;
81 height: 400px;
82 width: 600px;
83 padding: 10px;
84 position: relative;
85 }
86
87 .section {
88 margin-top: 10px;
89 }
90
91 .option {
92 margin-top: 5px;
93 }
94
95 .section-title {
96 font-weight: bold;
97 }
98
99 .option-control-table {
100 margin-top: 5px;
101 -webkit-padding-start: 10px;
102 }
103
104 .hidden {
105 display: none;
106 }
107
108 .touch-slider {
109 -webkit-appearance: slider-horizontal;
110 }
111
112 </style> 60 </style>
113 </head> 61 </head>
114 <body onload="load();" 62 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
115 i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
116 <div class="header"> 63 <div class="header">
117 </div> 64 </div>
118 <div id="main-content"> 65 <div id="main-content">
119 <div id="navbar-container"> 66 <div id="navbar-container">
120 <ul id="navbar"> 67 <ul id="navbar">
121 </ul> 68 </ul>
122 <hr/> 69 <hr>
123 <ul class="hidden"> 70 <ul class="hidden">
124 </ul> 71 </ul>
125 </div> 72 </div>
126 <div id="mainview"> 73 <div id="mainview">
127 <if expr="pp_ifdef('chromeos')"> 74 <if expr="pp_ifdef('chromeos')">
128 <include src="options/chromeos_system_options.html"> 75 <include src="options/chromeos_system_options.html">
129 </if> 76 </if>
130 <!-- include file="options/chromeos_labs.html" --> 77 <include src="options/browser_options.html">
78 <include src="options/personal_options.html">
79 <include src="options/advanced_options.html">
131 </div> 80 </div>
132 </div> 81 </div>
133 <script> 82 <script>
134 // Decorate the existing elements in the document. 83 // Decorate the existing elements in the document.
135 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox); 84 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox);
136 cr.ui.decorate('input[pref][type=range]', PrefRange); 85 cr.ui.decorate('input[pref][type=range]', PrefRange);
137 cr.ui.decorate('select[pref]', PrefSelect); 86 cr.ui.decorate('select[pref]', PrefSelect);
138 <!-- TODO(zelidrag) add other elements here when we implement them --> 87 // TODO(zelidrag) add other elements here when we implement them
139 </script> 88 </script>
140 </body> 89 </body>
141 </html> 90 </html>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/personal_options_handler.cc ('k') | chrome/browser/resources/options/advanced_options.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698