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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 3020021: DOMUI prefs: Add and wire up a stub overlay for adding a startup page. (Closed)
Patch Set: Addresses review comments 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/add_startup_page_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>
(...skipping 13 matching lines...) Expand all
24 <script src="options/chromeos_system_options.js"></script> 24 <script src="options/chromeos_system_options.js"></script>
25 <script src="options/chromeos_accounts_options.js"></script> 25 <script src="options/chromeos_accounts_options.js"></script>
26 <script src="options/chromeos_accounts_user_list.js"></script> 26 <script src="options/chromeos_accounts_user_list.js"></script>
27 <script src="options/chromeos_accounts_add_user_overlay.js"></script> 27 <script src="options/chromeos_accounts_add_user_overlay.js"></script>
28 </if> 28 </if>
29 <script src="options/advanced_options.js"></script> 29 <script src="options/advanced_options.js"></script>
30 <script src="options/browser_options.js"></script> 30 <script src="options/browser_options.js"></script>
31 <script src="options/personal_options.js"></script> 31 <script src="options/personal_options.js"></script>
32 <script src="options/content_settings_ui.js"></script> 32 <script src="options/content_settings_ui.js"></script>
33 <script src="options/content_settings.js"></script> 33 <script src="options/content_settings.js"></script>
34 <script src="options/add_startup_page_overlay.js"></script>
34 <script src="options/clear_browser_data_overlay.js"></script> 35 <script src="options/clear_browser_data_overlay.js"></script>
35 <script src="options/font_settings_overlay.js"></script> 36 <script src="options/font_settings_overlay.js"></script>
36 <script> 37 <script>
37 38
38 /////////////////////////////////////////////////////////////////////////////// 39 ///////////////////////////////////////////////////////////////////////////////
39 // Document Functions: 40 // Document Functions:
40 /** 41 /**
41 * Window onload handler, sets up the page. 42 * Window onload handler, sets up the page.
42 */ 43 */
43 function load() { 44 function load() {
(...skipping 10 matching lines...) Expand all
54 // OptionsPage.register(new OptionsPage( 55 // OptionsPage.register(new OptionsPage(
55 // 'languageHangul', 56 // 'languageHangul',
56 // localStrings.getString('languageHangulPage'), 57 // localStrings.getString('languageHangulPage'),
57 // 'languageHangulPage')); 58 // 'languageHangulPage'));
58 } 59 }
59 60
60 OptionsPage.register(BrowserOptions.getInstance()); 61 OptionsPage.register(BrowserOptions.getInstance());
61 OptionsPage.register(PersonalOptions.getInstance()); 62 OptionsPage.register(PersonalOptions.getInstance());
62 OptionsPage.register(AdvancedOptions.getInstance()); 63 OptionsPage.register(AdvancedOptions.getInstance());
63 OptionsPage.registerSubPage(ContentSettings.getInstance()); 64 OptionsPage.registerSubPage(ContentSettings.getInstance());
65 OptionsPage.registerOverlay(AddStartupPageOverlay.getInstance());
64 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance()); 66 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance());
65 OptionsPage.registerOverlay(FontSettingsOverlay.getInstance()); 67 OptionsPage.registerOverlay(FontSettingsOverlay.getInstance());
66 68
67 if (cr.isChromeOS) { 69 if (cr.isChromeOS) {
68 var labsOptions = new OptionsPage('labs', 70 var labsOptions = new OptionsPage('labs',
69 localStrings.getString('labsPage'), 71 localStrings.getString('labsPage'),
70 'labsPage'); 72 'labsPage');
71 OptionsPage.register(labsOptions); 73 OptionsPage.register(labsOptions);
72 var languageSettings = new OptionsPage('language', 74 var languageSettings = new OptionsPage('language',
73 localStrings.getString( 75 localStrings.getString(
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 <link rel="stylesheet" href="options/chromeos_language_options.css"> 111 <link rel="stylesheet" href="options/chromeos_language_options.css">
110 </if> 112 </if>
111 <link rel="stylesheet" href="options/personal_options.css"> 113 <link rel="stylesheet" href="options/personal_options.css">
112 </head> 114 </head>
113 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 115 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
114 <div class="header"> 116 <div class="header">
115 </div> 117 </div>
116 <div id="overlay" class="overlay hidden"> 118 <div id="overlay" class="overlay hidden">
117 <div id="overlayview"> 119 <div id="overlayview">
118 <button id="close-overlay" onclick="OptionsPage.clearOverlays();"></button> 120 <button id="close-overlay" onclick="OptionsPage.clearOverlays();"></button>
121 <include src="options/add_startup_page_overlay.html">
119 <include src="options/clear_browser_data_overlay.html"> 122 <include src="options/clear_browser_data_overlay.html">
120 <include src="options/font_settings_overlay.html"> 123 <include src="options/font_settings_overlay.html">
121 <if expr="pp_ifdef('chromeos')"> 124 <if expr="pp_ifdef('chromeos')">
122 <include src="options/chromeos_accounts_add_user_overlay.html"> 125 <include src="options/chromeos_accounts_add_user_overlay.html">
123 </if> 126 </if>
124 </div> 127 </div>
125 </div> 128 </div>
126 <div id="main-content"> 129 <div id="main-content">
127 <div id="navbar-container"> 130 <div id="navbar-container">
128 <h1 id="settings-title" i18n-content="title"></h1> 131 <h1 id="settings-title" i18n-content="title"></h1>
(...skipping 29 matching lines...) Expand all
158 cr.ui.decorate('input[pref][type=number]', PrefNumber); 161 cr.ui.decorate('input[pref][type=number]', PrefNumber);
159 cr.ui.decorate('input[pref][type=radio]', PrefRadio); 162 cr.ui.decorate('input[pref][type=radio]', PrefRadio);
160 cr.ui.decorate('input[pref][type=range]', PrefRange); 163 cr.ui.decorate('input[pref][type=range]', PrefRange);
161 cr.ui.decorate('select[pref]', PrefSelect); 164 cr.ui.decorate('select[pref]', PrefSelect);
162 cr.ui.decorate('input[pref][type=url]', PrefTextField); 165 cr.ui.decorate('input[pref][type=url]', PrefTextField);
163 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio); 166 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio);
164 // TODO(zelidrag) add other elements here when we implement them 167 // TODO(zelidrag) add other elements here when we implement them
165 </script> 168 </script>
166 </body> 169 </body>
167 </html> 170 </html>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options_ui.cc ('k') | chrome/browser/resources/options/add_startup_page_overlay.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698