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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2868067: Implement new mock for user options page per chromium-os:5028 (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: per arv's comments #2 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
« no previous file with comments | « chrome/browser/dom_ui/options_ui.cc ('k') | chrome/browser/resources/options/chromeos_accounts_add_user_overlay.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/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_language_list.js"></script> 24 <script src="options/chromeos_language_list.js"></script>
25 <script src="options/chromeos_language_options.js"></script> 25 <script src="options/chromeos_language_options.js"></script>
26 <script src="options/chromeos_system_options.js"></script> 26 <script src="options/chromeos_system_options.js"></script>
27 <script src="options/chromeos_accounts_options.js"></script> 27 <script src="options/chromeos_accounts_options.js"></script>
28 <script src="options/chromeos_accounts_user_list.js"></script> 28 <script src="options/chromeos_accounts_user_list.js"></script>
29 <script src="options/chromeos_accounts_add_user_overlay.js"></script> 29 <script src="options/chromeos_accounts_user_name_edit.js"></script>
30 </if> 30 </if>
31 <script src="options/advanced_options.js"></script> 31 <script src="options/advanced_options.js"></script>
32 <script src="options/browser_options.js"></script> 32 <script src="options/browser_options.js"></script>
33 <script src="options/personal_options.js"></script> 33 <script src="options/personal_options.js"></script>
34 <script src="options/content_settings_ui.js"></script> 34 <script src="options/content_settings_ui.js"></script>
35 <script src="options/content_settings.js"></script> 35 <script src="options/content_settings.js"></script>
36 <script src="options/add_startup_page_overlay.js"></script> 36 <script src="options/add_startup_page_overlay.js"></script>
37 <script src="options/clear_browser_data_overlay.js"></script> 37 <script src="options/clear_browser_data_overlay.js"></script>
38 <script src="options/font_settings_overlay.js"></script> 38 <script src="options/font_settings_overlay.js"></script>
39 <script> 39 <script>
40 40
41 /////////////////////////////////////////////////////////////////////////////// 41 ///////////////////////////////////////////////////////////////////////////////
42 // Document Functions: 42 // Document Functions:
43 /** 43 /**
44 * Window onload handler, sets up the page. 44 * Window onload handler, sets up the page.
45 */ 45 */
46 function load() { 46 function load() {
47 localStrings = new LocalStrings(); 47 localStrings = new LocalStrings();
48 48
49 if (cr.isChromeOS) { 49 if (cr.isChromeOS) {
50 OptionsPage.register(SystemOptions.getInstance()); 50 OptionsPage.register(SystemOptions.getInstance());
51 OptionsPage.register(AccountsOptions.getInstance());
52 // TODO(mazda): uncomment this once the language options is ready 51 // TODO(mazda): uncomment this once the language options is ready
53 // OptionsPage.register(new OptionsPage( 52 // OptionsPage.register(new OptionsPage(
54 // 'languageChewing', 53 // 'languageChewing',
55 // localStrings.getString('languageChewingPage'), 54 // localStrings.getString('languageChewingPage'),
56 // 'languageChewingPage')); 55 // 'languageChewingPage'));
57 // OptionsPage.register(new OptionsPage( 56 // OptionsPage.register(new OptionsPage(
58 // 'languageHangul', 57 // 'languageHangul',
59 // localStrings.getString('languageHangulPage'), 58 // localStrings.getString('languageHangulPage'),
60 // 'languageHangulPage')); 59 // 'languageHangulPage'));
61 } 60 }
62 61
63 OptionsPage.register(BrowserOptions.getInstance()); 62 OptionsPage.register(BrowserOptions.getInstance());
64 OptionsPage.register(PersonalOptions.getInstance()); 63 OptionsPage.register(PersonalOptions.getInstance());
65 OptionsPage.register(AdvancedOptions.getInstance()); 64 OptionsPage.register(AdvancedOptions.getInstance());
66 OptionsPage.registerSubPage(ContentSettings.getInstance()); 65 OptionsPage.registerSubPage(ContentSettings.getInstance());
67 OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance()); 66 OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance());
68 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance()); 67 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance());
69 OptionsPage.registerOverlay(FontSettingsOverlay.getInstance()); 68 OptionsPage.registerOverlay(FontSettingsOverlay.getInstance());
70 69
71 if (cr.isChromeOS) { 70 if (cr.isChromeOS) {
71 OptionsPage.register(AccountsOptions.getInstance());
72 var labsOptions = new OptionsPage('labs', 72 var labsOptions = new OptionsPage('labs',
73 localStrings.getString('labsPage'), 73 localStrings.getString('labsPage'),
74 'labsPage'); 74 'labsPage');
75 OptionsPage.register(labsOptions); 75 OptionsPage.register(labsOptions);
76 OptionsPage.registerSubPage(LanguageOptions.getInstance()); 76 OptionsPage.registerSubPage(LanguageOptions.getInstance());
77 } 77 }
78 78
79 var syncSettings = new OptionsPage('sync', 79 var syncSettings = new OptionsPage('sync',
80 localStrings.getString('syncPage'), 80 localStrings.getString('syncPage'),
81 'syncPage'); 81 'syncPage');
(...skipping 30 matching lines...) Expand all
112 <link rel="stylesheet" href="options/personal_options.css"> 112 <link rel="stylesheet" href="options/personal_options.css">
113 </head> 113 </head>
114 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 114 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
115 <div class="header"> 115 <div class="header">
116 </div> 116 </div>
117 <div id="overlay" class="overlay hidden"> 117 <div id="overlay" class="overlay hidden">
118 <div id="overlayview"> 118 <div id="overlayview">
119 <include src="options/add_startup_page_overlay.html"> 119 <include src="options/add_startup_page_overlay.html">
120 <include src="options/clear_browser_data_overlay.html"> 120 <include src="options/clear_browser_data_overlay.html">
121 <include src="options/font_settings_overlay.html"> 121 <include src="options/font_settings_overlay.html">
122 <if expr="pp_ifdef('chromeos')">
123 <include src="options/chromeos_accounts_add_user_overlay.html">
124 </if>
125 </div> 122 </div>
126 </div> 123 </div>
127 <div id="main-content"> 124 <div id="main-content">
128 <div id="navbar-container"> 125 <div id="navbar-container">
129 <h1 id="settings-title" i18n-content="title"></h1> 126 <h1 id="settings-title" i18n-content="title"></h1>
130 <ul id="navbar"> 127 <ul id="navbar">
131 </ul> 128 </ul>
132 <hr/> 129 <hr/>
133 <ul id="subpagesnav"> 130 <ul id="subpagesnav">
134 </ul> 131 </ul>
(...skipping 25 matching lines...) Expand all
160 cr.ui.decorate('input[pref][type=number]', PrefNumber); 157 cr.ui.decorate('input[pref][type=number]', PrefNumber);
161 cr.ui.decorate('input[pref][type=radio]', PrefRadio); 158 cr.ui.decorate('input[pref][type=radio]', PrefRadio);
162 cr.ui.decorate('input[pref][type=range]', PrefRange); 159 cr.ui.decorate('input[pref][type=range]', PrefRange);
163 cr.ui.decorate('select[pref]', PrefSelect); 160 cr.ui.decorate('select[pref]', PrefSelect);
164 cr.ui.decorate('input[pref][type=url]', PrefTextField); 161 cr.ui.decorate('input[pref][type=url]', PrefTextField);
165 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio); 162 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio);
166 // TODO(zelidrag) add other elements here when we implement them 163 // TODO(zelidrag) add other elements here when we implement them
167 </script> 164 </script>
168 </body> 165 </body>
169 </html> 166 </html>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options_ui.cc ('k') | chrome/browser/resources/options/chromeos_accounts_add_user_overlay.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698