Chromium Code Reviews

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

Issue 5025001: Removed Labs section from Chrome OS settings page. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed RegisterPref call Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | | Annotate | Revision Log
« no previous file with comments | « chrome/browser/dom_ui/options/options_ui.cc ('k') | chrome/browser/resources/options/chromeos_labs.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 2 <html
3 i18n-values="dir:textdirection; 3 i18n-values="dir:textdirection;
4 enable-background-mode:enable-background-mode; 4 enable-background-mode:enable-background-mode;
5 enable-cloud-print-proxy:enable-cloud-print-proxy" 5 enable-cloud-print-proxy:enable-cloud-print-proxy"
6 id="t"> 6 id="t">
7 <head> 7 <head>
8 <meta charset="utf-8"> 8 <meta charset="utf-8">
9 <title i18n-content="title"></title> 9 <title i18n-content="title"></title>
10 10
(...skipping 177 matching lines...)
188 OptionsPage.registerOverlay(AlertOverlay.getInstance()); 188 OptionsPage.registerOverlay(AlertOverlay.getInstance());
189 OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance()); 189 OptionsPage.registerOverlay(AutoFillEditAddressOverlay.getInstance());
190 OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance()); 190 OptionsPage.registerOverlay(AutoFillEditCreditCardOverlay.getInstance());
191 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance()); 191 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance());
192 OptionsPage.registerOverlay(EditSearchEngineOverlay.getInstance()); 192 OptionsPage.registerOverlay(EditSearchEngineOverlay.getInstance());
193 OptionsPage.registerOverlay(ImportDataOverlay.getInstance()); 193 OptionsPage.registerOverlay(ImportDataOverlay.getInstance());
194 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance()); 194 OptionsPage.registerOverlay(InstantConfirmOverlay.getInstance());
195 195
196 if (cr.isChromeOS) { 196 if (cr.isChromeOS) {
197 OptionsPage.register(AccountsOptions.getInstance()); 197 OptionsPage.register(AccountsOptions.getInstance());
198 var labsOptions = new OptionsPage('labs',
199 localStrings.getString('labsPage'),
200 'labsPage');
201 OptionsPage.register(labsOptions);
202 OptionsPage.registerSubPage(LanguageOptions.getInstance()); 198 OptionsPage.registerSubPage(LanguageOptions.getInstance());
203 OptionsPage.registerSubPage(new OptionsPage( 199 OptionsPage.registerSubPage(new OptionsPage(
204 'languageChewing', 200 'languageChewing',
205 localStrings.getString('languageChewingPage'), 201 localStrings.getString('languageChewingPage'),
206 'languageChewingPage')); 202 'languageChewingPage'));
207 OptionsPage.registerSubPage(new OptionsPage( 203 OptionsPage.registerSubPage(new OptionsPage(
208 'languageHangul', 204 'languageHangul',
209 localStrings.getString('languageHangulPage'), 205 localStrings.getString('languageHangulPage'),
210 'languageHangulPage')); 206 'languageHangulPage'));
211 OptionsPage.registerSubPage(new OptionsPage( 207 OptionsPage.registerSubPage(new OptionsPage(
(...skipping 106 matching lines...)
318 <div id="mainview-content"> 314 <div id="mainview-content">
319 <if expr="pp_ifdef('chromeos')"> 315 <if expr="pp_ifdef('chromeos')">
320 <include src="options/about_page.html"> 316 <include src="options/about_page.html">
321 <include src="options/chromeos_system_options.html"> 317 <include src="options/chromeos_system_options.html">
322 <include src="options/chromeos_internet_options.html"> 318 <include src="options/chromeos_internet_options.html">
323 <include src="options/chromeos_language_options.html"> 319 <include src="options/chromeos_language_options.html">
324 <include src="options/chromeos_language_chewing_options.html"> 320 <include src="options/chromeos_language_chewing_options.html">
325 <include src="options/chromeos_language_hangul_options.html"> 321 <include src="options/chromeos_language_hangul_options.html">
326 <include src="options/chromeos_language_mozc_options.html"> 322 <include src="options/chromeos_language_mozc_options.html">
327 <include src="options/chromeos_language_pinyin_options.html"> 323 <include src="options/chromeos_language_pinyin_options.html">
328 <include src="options/chromeos_labs.html">
329 <include src="options/chromeos_accounts_options.html"> 324 <include src="options/chromeos_accounts_options.html">
330 <include src="options/chromeos_proxy.html"> 325 <include src="options/chromeos_proxy.html">
331 </if> 326 </if>
332 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')"> 327 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">
333 <include src="options/certificate_manager.html"> 328 <include src="options/certificate_manager.html">
334 </if> 329 </if>
335 <include src="options/advanced_options.html"> 330 <include src="options/advanced_options.html">
336 <include src="options/autofill_options.html"> 331 <include src="options/autofill_options.html">
337 <include src="options/browser_options.html"> 332 <include src="options/browser_options.html">
338 <include src="options/content_settings.html"> 333 <include src="options/content_settings.html">
(...skipping 17 matching lines...)
356 cr.ui.decorate('input[pref][type=text]', options.PrefTextField); 351 cr.ui.decorate('input[pref][type=text]', options.PrefTextField);
357 cr.ui.decorate('input[pref][type=url]', options.PrefTextField); 352 cr.ui.decorate('input[pref][type=url]', options.PrefTextField);
358 cr.ui.decorate('#contentSettingsPage input[type=radio]', 353 cr.ui.decorate('#contentSettingsPage input[type=radio]',
359 options.ContentSettingsRadio); 354 options.ContentSettingsRadio);
360 cr.ui.decorate('#fontSettingsMinimumSizeSelector', 355 cr.ui.decorate('#fontSettingsMinimumSizeSelector',
361 options.MinimumFontSizeSelect); 356 options.MinimumFontSizeSelect);
362 console.log('in bottom script'); 357 console.log('in bottom script');
363 </script> 358 </script>
364 </body> 359 </body>
365 </html> 360 </html>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options/options_ui.cc ('k') | chrome/browser/resources/options/chromeos_labs.html » ('j') | no next file with comments »

Powered by Google App Engine