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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2812063: Add starter code for 'Clear Browser Data' and 'Font Settings' overlay dialogs... (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/options_ui.cc ('k') | chrome/browser/resources/options/advanced_options.js » ('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 14 matching lines...) Expand all
25 <script src="options/chromeos_system_options.js"></script> 25 <script src="options/chromeos_system_options.js"></script>
26 <script src="options/chromeos_accounts_options.js"></script> 26 <script src="options/chromeos_accounts_options.js"></script>
27 <script src="options/chromeos_accounts_user_list.js"></script> 27 <script src="options/chromeos_accounts_user_list.js"></script>
28 <script src="options/chromeos_accounts_add_user_overlay.js"></script> 28 <script src="options/chromeos_accounts_add_user_overlay.js"></script>
29 </if> 29 </if>
30 <script src="options/advanced_options.js"></script> 30 <script src="options/advanced_options.js"></script>
31 <script src="options/browser_options.js"></script> 31 <script src="options/browser_options.js"></script>
32 <script src="options/personal_options.js"></script> 32 <script src="options/personal_options.js"></script>
33 <script src="options/content_settings_ui.js"></script> 33 <script src="options/content_settings_ui.js"></script>
34 <script src="options/content_settings.js"></script> 34 <script src="options/content_settings.js"></script>
35 <script src="options/clear_browser_data_overlay.js"></script>
36 <script src="options/font_settings_overlay.js"></script>
35 <script> 37 <script>
36 38
37 /////////////////////////////////////////////////////////////////////////////// 39 ///////////////////////////////////////////////////////////////////////////////
38 // Document Functions: 40 // Document Functions:
39 /** 41 /**
40 * Window onload handler, sets up the page. 42 * Window onload handler, sets up the page.
41 */ 43 */
42 function load() { 44 function load() {
43 localStrings = new LocalStrings(); 45 localStrings = new LocalStrings();
46
44 if (cr.isChromeOS) { 47 if (cr.isChromeOS) {
45 OptionsPage.register(SystemOptions.getInstance()); 48 OptionsPage.register(SystemOptions.getInstance());
46 OptionsPage.register(AccountsOptions.getInstance()); 49 OptionsPage.register(AccountsOptions.getInstance());
47 // TODO(mazda): uncomment this once the language options is ready 50 // TODO(mazda): uncomment this once the language options is ready
48 // OptionsPage.register(LanguageHangulOptions.getInstance()); 51 // OptionsPage.register(LanguageHangulOptions.getInstance());
49 } 52 }
50 53
51 OptionsPage.register(BrowserOptions.getInstance()); 54 OptionsPage.register(BrowserOptions.getInstance());
52 OptionsPage.register(PersonalOptions.getInstance()); 55 OptionsPage.register(PersonalOptions.getInstance());
53 OptionsPage.register(AdvancedOptions.getInstance()); 56 OptionsPage.register(AdvancedOptions.getInstance());
54 OptionsPage.registerSubPage(ContentSettings.getInstance()); 57 OptionsPage.registerSubPage(ContentSettings.getInstance());
58 OptionsPage.registerOverlay(ClearBrowserDataOverlay.getInstance());
59 OptionsPage.registerOverlay(FontSettingsOverlay.getInstance());
55 60
56 if (cr.isChromeOS) { 61 if (cr.isChromeOS) {
57 var labsOptions = new OptionsPage('labs', 62 var labsOptions = new OptionsPage('labs',
58 localStrings.getString('labsPage'), 63 localStrings.getString('labsPage'),
59 'labsPage'); 64 'labsPage');
60 OptionsPage.register(labsOptions); 65 OptionsPage.register(labsOptions);
61 var languageSettings = new OptionsPage('language', 66 var languageSettings = new OptionsPage('language',
62 localStrings.getString( 67 localStrings.getString(
63 'languagePage'), 68 'languagePage'),
64 'languagePage'); 69 'languagePage');
65 OptionsPage.registerSubPage(languageSettings); 70 OptionsPage.registerSubPage(languageSettings);
66 } 71 }
67 72
68 var syncSettings = new OptionsPage('sync', 73 var syncSettings = new OptionsPage('sync',
69 localStrings.getString('syncPage'), 74 localStrings.getString('syncPage'),
70 'syncPage'); 75 'syncPage');
71 OptionsPage.registerSubPage(syncSettings); 76 OptionsPage.registerSubPage(syncSettings);
72 77
73 var dummyPage = new OptionsPage('dummy', 'Overlay Test Page', 'dummyPage');
74 OptionsPage.registerOverlay(dummyPage);
75
76 Preferences.getInstance().initialize(); 78 Preferences.getInstance().initialize();
77 OptionsPage.initialize(); 79 OptionsPage.initialize();
78 80
81 // TODO(csilv): Save/restore last selected page.
79 if (cr.isChromeOS) { 82 if (cr.isChromeOS) {
80 OptionsPage.showPageByName(SystemOptions.getInstance().name); 83 OptionsPage.showPageByName(SystemOptions.getInstance().name);
81 } else { 84 } else {
82 OptionsPage.showPageByName(BrowserOptions.getInstance().name); 85 OptionsPage.showPageByName(BrowserOptions.getInstance().name);
83 } 86 }
84 } 87 }
85 88
86 document.addEventListener('DOMContentLoaded', load); 89 document.addEventListener('DOMContentLoaded', load);
87 90
88 window.onpopstate = function(e) { 91 window.onpopstate = function(e) {
89 OptionsPage.setState(e.state); 92 OptionsPage.setState(e.state);
90 }; 93 };
91 94
92 </script> 95 </script>
93 <link rel="stylesheet" href="chrome://resources/css/list.css"> 96 <link rel="stylesheet" href="chrome://resources/css/list.css">
94
95 <link rel="stylesheet" href="dom_ui.css"> 97 <link rel="stylesheet" href="dom_ui.css">
96 <link rel="stylesheet" href="options/options_page.css"> 98 <link rel="stylesheet" href="options/options_page.css">
97 <link rel="stylesheet" href="options/browser_options_page.css"> 99 <link rel="stylesheet" href="options/browser_options_page.css">
98 <link rel="stylesheet" href="options/content_settings_page.css"> 100 <link rel="stylesheet" href="options/content_settings_page.css">
99 <if expr="pp_ifdef('chromeos')"> 101 <if expr="pp_ifdef('chromeos')">
100 <link rel="stylesheet" href="options/chromeos_accounts_options_page.css"> 102 <link rel="stylesheet" href="options/chromeos_accounts_options_page.css">
101 </if> 103 </if>
102 </head> 104 </head>
103 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 105 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
104 <div class="header"> 106 <div class="header">
105 </div> 107 </div>
106 <div id="overlay" class="overlay hidden"> 108 <div id="overlay" class="overlay hidden">
107 <div id="overlayview"> 109 <div id="overlayview">
108 <button id="close-overlay" onclick="OptionsPage.clearOverlays();"></button> 110 <button id="close-overlay" onclick="OptionsPage.clearOverlays();"></button>
109 <div class="page hidden" id="dummyPage"> 111 <include src="options/clear_browser_data_overlay.html">
110 <!-- TODO(dhg): remove this one once we get another page here --> 112 <include src="options/font_settings_overlay.html">
111 Dummy Overlay Page
112 </div>
113 <if expr="pp_ifdef('chromeos')"> 113 <if expr="pp_ifdef('chromeos')">
114 <include src="options/chromeos_accounts_add_user_overlay.html"> 114 <include src="options/chromeos_accounts_add_user_overlay.html">
115 </if> 115 </if>
116 </div> 116 </div>
117 </div> 117 </div>
118 <div id="main-content"> 118 <div id="main-content">
119 <div id="navbar-container"> 119 <div id="navbar-container">
120 <h1 id="settings-title" i18n-content="title"></h1> 120 <h1 id="settings-title" i18n-content="title"></h1>
121 <ul id="navbar"> 121 <ul id="navbar">
122 </ul> 122 </ul>
(...skipping 21 matching lines...) Expand all
144 <script> 144 <script>
145 // Decorate the existing elements in the document. 145 // Decorate the existing elements in the document.
146 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox); 146 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox);
147 cr.ui.decorate('input[pref][type=range]', PrefRange); 147 cr.ui.decorate('input[pref][type=range]', PrefRange);
148 cr.ui.decorate('select[pref]', PrefSelect); 148 cr.ui.decorate('select[pref]', PrefSelect);
149 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio); 149 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio);
150 // TODO(zelidrag) add other elements here when we implement them 150 // TODO(zelidrag) add other elements here when we implement them
151 </script> 151 </script>
152 </body> 152 </body>
153 </html> 153 </html>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options_ui.cc ('k') | chrome/browser/resources/options/advanced_options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698