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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2804039: First cut at the tabbed content settings page. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: no change 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/content_settings.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/local_strings.js"></script> 14 <script src="chrome://resources/js/local_strings.js"></script>
15 <script src="chrome://resources/js/util.js"></script> 15 <script src="chrome://resources/js/util.js"></script>
16 <script src="options/preferences.js"></script> 16 <script src="options/preferences.js"></script>
17 <script src="options/pref_ui.js"></script> 17 <script src="options/pref_ui.js"></script>
18 <script src="options/options_page.js"></script> 18 <script src="options/options_page.js"></script>
19 <if expr="pp_ifdef('chromeos')"> 19 <if expr="pp_ifdef('chromeos')">
20 <script src="options/chromeos_system_options.js"></script> 20 <script src="options/chromeos_system_options.js"></script>
21 </if> 21 </if>
22 <script src="options/advanced_options.js"></script> 22 <script src="options/advanced_options.js"></script>
23 <script src="options/browser_options.js"></script> 23 <script src="options/browser_options.js"></script>
24 <script src="options/personal_options.js"></script> 24 <script src="options/personal_options.js"></script>
25 <script src="options/content_settings_ui.js"></script>
26 <script src="options/content_settings.js"></script>
25 <script> 27 <script>
26 28
27 /////////////////////////////////////////////////////////////////////////////// 29 ///////////////////////////////////////////////////////////////////////////////
28 // Document Functions: 30 // Document Functions:
29 /** 31 /**
30 * Window onload handler, sets up the page. 32 * Window onload handler, sets up the page.
31 */ 33 */
32 function load() { 34 function load() {
33 localStrings = new LocalStrings(); 35 localStrings = new LocalStrings();
34 if (cr.isChromeOS) { 36 if (cr.isChromeOS) {
35 OptionsPage.register(SystemOptions.getInstance()); 37 OptionsPage.register(SystemOptions.getInstance());
36 } 38 }
37 OptionsPage.register(BrowserOptions.getInstance()); 39 OptionsPage.register(BrowserOptions.getInstance());
38 OptionsPage.register(PersonalOptions.getInstance()); 40 OptionsPage.register(PersonalOptions.getInstance());
39 OptionsPage.register(AdvancedOptions.getInstance()); 41 OptionsPage.register(AdvancedOptions.getInstance());
42 OptionsPage.register(ContentSettings.getInstance());
40 if (cr.isChromeOS) { 43 if (cr.isChromeOS) {
41 var labsOptions = new OptionsPage('labs', 44 var labsOptions = new OptionsPage('labs',
42 localStrings.getString('labsPage'), 45 localStrings.getString('labsPage'),
43 'labsPage'); 46 'labsPage');
44 OptionsPage.register(labsOptions); 47 OptionsPage.register(labsOptions);
45 } 48 }
46 49
47 var syncSettings = new OptionsPage('sync', 50 var syncSettings = new OptionsPage('sync',
48 localStrings.getString('syncPage'), 51 localStrings.getString('syncPage'),
49 'syncPage'); 52 'syncPage');
(...skipping 12 matching lines...) Expand all
62 65
63 document.addEventListener('DOMContentLoaded', load); 66 document.addEventListener('DOMContentLoaded', load);
64 67
65 window.onpopstate = function(e) { 68 window.onpopstate = function(e) {
66 OptionsPage.setState(e.state); 69 OptionsPage.setState(e.state);
67 }; 70 };
68 71
69 </script> 72 </script>
70 <link rel="stylesheet" href="dom_ui.css"> 73 <link rel="stylesheet" href="dom_ui.css">
71 <link rel="stylesheet" href="options/options_page.css"> 74 <link rel="stylesheet" href="options/options_page.css">
75 <link rel="stylesheet" href="options/content_settings_page.css">
72 </head> 76 </head>
73 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize"> 77 <body i18n-values=".style.fontFamily:fontfamily;.style.fontSize:fontsize">
74 <div class="header"> 78 <div class="header">
75 </div> 79 </div>
76 <div id="overlay" class="hidden"> 80 <div id="overlay" class="hidden">
77 <div id="overlayview"> 81 <div id="overlayview">
78 <button id="close-overlay" onclick="OptionsPage.clearOverlays();"></button> 82 <button id="close-overlay" onclick="OptionsPage.clearOverlays();"></button>
79 <div class="page hidden" id="dummyPage"> 83 <div class="page hidden" id="dummyPage">
80 <!-- TODO(dhg): remove this one once we get another page here --> 84 <!-- TODO(dhg): remove this one once we get another page here -->
81 Dummy Overlay Page 85 Dummy Overlay Page
82 </div> 86 </div>
83 </div> 87 </div>
84 </div> 88 </div>
85 <div id="main-content"> 89 <div id="main-content">
86 <div id="navbar-container"> 90 <div id="navbar-container">
87 <h1 id="settings-title" i18n-content="title"></h1> 91 <h1 id="settings-title" i18n-content="title"></h1>
88 <ul id="navbar"> 92 <ul id="navbar">
89 </ul> 93 </ul>
90 <hr/> 94 <hr/>
91 <ul id="subpagesnav"> 95 <ul id="subpagesnav">
92 </ul> 96 </ul>
93 </div> 97 </div>
94 <div id="mainview"> 98 <div id="mainview">
95 <if expr="pp_ifdef('chromeos')"> 99 <if expr="pp_ifdef('chromeos')">
96 <include src="options/chromeos_system_options.html"> 100 <include src="options/chromeos_system_options.html">
97 <include src="options/chromeos_labs.html"> 101 <include src="options/chromeos_labs.html">
98 <include src="options/sync_options.html" > 102 <include src="options/sync_options.html" >
99 </if> 103 </if>
100 <include src="options/browser_options.html"> 104 <include src="options/browser_options.html">
101 <include src="options/personal_options.html"> 105 <include src="options/personal_options.html">
102 <include src="options/advanced_options.html"> 106 <include src="options/advanced_options.html">
107 <include src="options/content_settings.html">
103 </div> 108 </div>
104 </div> 109 </div>
105 <script> 110 <script>
106 // Decorate the existing elements in the document. 111 // Decorate the existing elements in the document.
107 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox); 112 cr.ui.decorate('input[pref][type=checkbox]', PrefCheckbox);
108 cr.ui.decorate('input[pref][type=range]', PrefRange); 113 cr.ui.decorate('input[pref][type=range]', PrefRange);
109 cr.ui.decorate('select[pref]', PrefSelect); 114 cr.ui.decorate('select[pref]', PrefSelect);
115 cr.ui.decorate('#contentSettingsPage input[type=radio]', ContentSettingsRadio);
110 // TODO(zelidrag) add other elements here when we implement them 116 // TODO(zelidrag) add other elements here when we implement them
111 </script> 117 </script>
112 </body> 118 </body>
113 </html> 119 </html>
OLDNEW
« no previous file with comments | « chrome/browser/dom_ui/options_ui.cc ('k') | chrome/browser/resources/options/content_settings.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698