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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 3042005: Relanding: Personal stuff page in tabbed options (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Filter 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/sync_options_handler.cc ('k') | chrome/browser/resources/options/personal_options.css » ('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 25 matching lines...) Expand all
36 <script src="options/font_settings_overlay.js"></script> 36 <script src="options/font_settings_overlay.js"></script>
37 <script> 37 <script>
38 38
39 /////////////////////////////////////////////////////////////////////////////// 39 ///////////////////////////////////////////////////////////////////////////////
40 // Document Functions: 40 // Document Functions:
41 /** 41 /**
42 * Window onload handler, sets up the page. 42 * Window onload handler, sets up the page.
43 */ 43 */
44 function load() { 44 function load() {
45 localStrings = new LocalStrings(); 45 localStrings = new LocalStrings();
46 46
47 if (cr.isChromeOS) { 47 if (cr.isChromeOS) {
48 OptionsPage.register(SystemOptions.getInstance()); 48 OptionsPage.register(SystemOptions.getInstance());
49 OptionsPage.register(AccountsOptions.getInstance()); 49 OptionsPage.register(AccountsOptions.getInstance());
50 // TODO(mazda): uncomment this once the language options is ready 50 // TODO(mazda): uncomment this once the language options is ready
51 // OptionsPage.register(LanguageHangulOptions.getInstance()); 51 // OptionsPage.register(LanguageHangulOptions.getInstance());
52 } 52 }
53 53
54 OptionsPage.register(BrowserOptions.getInstance()); 54 OptionsPage.register(BrowserOptions.getInstance());
55 OptionsPage.register(PersonalOptions.getInstance()); 55 OptionsPage.register(PersonalOptions.getInstance());
56 OptionsPage.register(AdvancedOptions.getInstance()); 56 OptionsPage.register(AdvancedOptions.getInstance());
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 94
95 </script> 95 </script>
96 <link rel="stylesheet" href="chrome://resources/css/list.css"> 96 <link rel="stylesheet" href="chrome://resources/css/list.css">
97 <link rel="stylesheet" href="dom_ui.css"> 97 <link rel="stylesheet" href="dom_ui.css">
98 <link rel="stylesheet" href="options/options_page.css"> 98 <link rel="stylesheet" href="options/options_page.css">
99 <link rel="stylesheet" href="options/browser_options_page.css"> 99 <link rel="stylesheet" href="options/browser_options_page.css">
100 <link rel="stylesheet" href="options/content_settings_page.css"> 100 <link rel="stylesheet" href="options/content_settings_page.css">
101 <if expr="pp_ifdef('chromeos')"> 101 <if expr="pp_ifdef('chromeos')">
102 <link rel="stylesheet" href="options/chromeos_accounts_options_page.css"> 102 <link rel="stylesheet" href="options/chromeos_accounts_options_page.css">
103 </if> 103 </if>
104 <link rel="stylesheet" href="options/personal_options.css">
104 </head> 105 </head>
105 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 106 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
106 <div class="header"> 107 <div class="header">
107 </div> 108 </div>
108 <div id="overlay" class="overlay hidden"> 109 <div id="overlay" class="overlay hidden">
109 <div id="overlayview"> 110 <div id="overlayview">
110 <button id="close-overlay" onclick="OptionsPage.clearOverlays();"></button> 111 <button id="close-overlay" onclick="OptionsPage.clearOverlays();"></button>
111 <include src="options/clear_browser_data_overlay.html"> 112 <include src="options/clear_browser_data_overlay.html">
112 <include src="options/font_settings_overlay.html"> 113 <include src="options/font_settings_overlay.html">
113 <if expr="pp_ifdef('chromeos')"> 114 <if expr="pp_ifdef('chromeos')">
(...skipping 14 matching lines...) Expand all
128 <if expr="pp_ifdef('chromeos')"> 129 <if expr="pp_ifdef('chromeos')">
129 <include src="options/chromeos_system_options.html"> 130 <include src="options/chromeos_system_options.html">
130 <include src="options/chromeos_language_options.html"> 131 <include src="options/chromeos_language_options.html">
131 <include src="options/chromeos_labs.html"> 132 <include src="options/chromeos_labs.html">
132 <include src="options/chromeos_accounts_options.html"> 133 <include src="options/chromeos_accounts_options.html">
133 <!-- TODO(mazda): include options/chromeos_language_hangul_options.html 134 <!-- TODO(mazda): include options/chromeos_language_hangul_options.html
134 once the language options dialog is ready. --> 135 once the language options dialog is ready. -->
135 </if> 136 </if>
136 <include src="options/browser_options.html"> 137 <include src="options/browser_options.html">
137 <include src="options/personal_options.html"> 138 <include src="options/personal_options.html">
139 <include src="options/sync_options.html">
138 <include src="options/advanced_options.html"> 140 <include src="options/advanced_options.html">
139 <include src="options/content_settings.html"> 141 <include src="options/content_settings.html">
140 <include src="options/sync_options.html">
141 </div> 142 </div>
142 </div> 143 </div>
143 144
144 <script> 145 <script>
145 // Decorate the existing elements in the document. 146 // Decorate the existing elements in the document.
146 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox); 147 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox);
148 cr.ui.decorate('input[pref][type=radio]', PrefRadio);
147 cr.ui.decorate('input[pref][type=range]', PrefRange); 149 cr.ui.decorate('input[pref][type=range]', PrefRange);
148 cr.ui.decorate('select[pref]', PrefSelect); 150 cr.ui.decorate('select[pref]', PrefSelect);
149 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio); 151 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio);
150 // TODO(zelidrag) add other elements here when we implement them 152 // TODO(zelidrag) add other elements here when we implement them
151 </script> 153 </script>
152 </body> 154 </body>
153 </html> 155 </html>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/sync_options_handler.cc ('k') | chrome/browser/resources/options/personal_options.css » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698