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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 7003007: Apply content-security-policy to the HTML options page. This is a (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 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/resources/options/language_options.js ('k') | chrome/browser/resources/options/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 2 <html
3 i18n-values="dir:textdirection" 3 i18n-values="dir:textdirection"
4 id="t"> 4 id="t">
5 <head> 5 <head>
6 <meta charset="utf-8"> 6 <meta charset="utf-8">
7 <!-- X-WebKit-CSP is our development name for Content-Security-Policy.
8 TODO(tsepez) rename when Content-security-policy is done. -->
9 <meta http-equiv="X-WebKit-CSP" content="object-src 'none'; script-src chrome:// resources chrome://settings">
7 <!-- Set the title to that of the default page so that the title doesn't flash 10 <!-- Set the title to that of the default page so that the title doesn't flash
8 on load (for the most common case). --> 11 on load (for the most common case). -->
9 <title i18n-content="browserPageTabTitle"></title> 12 <title i18n-content="browserPageTabTitle"></title>
10 13
11 <link rel="icon" href="../../../app/theme/settings_favicon.png"> 14 <link rel="icon" href="../../../app/theme/settings_favicon.png">
12 <link rel="stylesheet" href="chrome://resources/css/button.css"> 15 <link rel="stylesheet" href="chrome://resources/css/button.css">
13 <link rel="stylesheet" href="chrome://resources/css/list.css"> 16 <link rel="stylesheet" href="chrome://resources/css/list.css">
14 <link rel="stylesheet" href="chrome://resources/css/throbber.css"> 17 <link rel="stylesheet" href="chrome://resources/css/throbber.css">
15 <link rel="stylesheet" href="chrome://resources/css/tree.css"> 18 <link rel="stylesheet" href="chrome://resources/css/tree.css">
16 <link rel="stylesheet" href="../webui.css"> 19 <link rel="stylesheet" href="../webui.css">
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script> 57 <script src="chrome://resources/js/cr/ui/array_data_model.js"></script>
55 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script> 58 <script src="chrome://resources/js/cr/ui/list_selection_model.js"></script>
56 <script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script> 59 <script src="chrome://resources/js/cr/ui/list_selection_controller.js"></script>
57 <script src="chrome://resources/js/cr/ui/list_single_selection_model.js"></scrip t> 60 <script src="chrome://resources/js/cr/ui/list_single_selection_model.js"></scrip t>
58 <script src="chrome://resources/js/cr/ui/list_item.js"></script> 61 <script src="chrome://resources/js/cr/ui/list_item.js"></script>
59 <script src="chrome://resources/js/cr/ui/list.js"></script> 62 <script src="chrome://resources/js/cr/ui/list.js"></script>
60 <script src="chrome://resources/js/cr/ui/position_util.js"></script> 63 <script src="chrome://resources/js/cr/ui/position_util.js"></script>
61 <script src="chrome://resources/js/cr/ui/tree.js"></script> 64 <script src="chrome://resources/js/cr/ui/tree.js"></script>
62 <script src="chrome://resources/js/local_strings.js"></script> 65 <script src="chrome://resources/js/local_strings.js"></script>
63 <script src="chrome://resources/js/util.js"></script> 66 <script src="chrome://resources/js/util.js"></script>
64 <script src="preferences.js"></script> 67 <script src="chrome://resources/js/options/preferences.js"></script>
65 <script src="pref_ui.js"></script> 68 <script src="chrome://resources/js/options/pref_ui.js"></script>
66 <script src="deletable_item_list.js"></script> 69 <script src="chrome://resources/js/options/deletable_item_list.js"></script>
67 <script src="inline_editable_list.js"></script> 70 <script src="chrome://resources/js/options/inline_editable_list.js"></script>
68 <script src="options_page.js"></script> 71 <script src="chrome://resources/js/options/options_page.js"></script>
69 <if expr="pp_ifdef('chromeos')"> 72 <if expr="pp_ifdef('chromeos')">
70 <script src="about_page.js"></script> 73 <script src="chrome://resources/js/chrome://resources/js/options/about_page.js "></script>
Evan Stade 2011/05/11 18:01:39 what
71 <script src="chromeos/cellular_plan_element.js"></script> 74 <script src="chrome://resources/js/chromeos/cellular_plan_element.js"></script >
72 <script src="chromeos/change_picture_options.js"></script> 75 <script src="chrome://resources/js/chromeos/change_picture_options.js"></scrip t>
73 <script src="chromeos/internet_network_element.js"></script> 76 <script src="chrome://resources/js/chromeos/internet_network_element.js"></scr ipt>
74 <script src="chromeos/internet_options.js"></script> 77 <script src="chrome://resources/js/chromeos/internet_options.js"></script>
75 <script src="chromeos/system_options.js"></script> 78 <script src="chrome://resources/js/chromeos/system_options.js"></script>
76 <script src="chromeos/accounts_options.js"></script> 79 <script src="chrome://resources/js/chromeos/accounts_options.js"></script>
77 <script src="chromeos/proxy_options.js"></script> 80 <script src="chrome://resources/js/chromeos/proxy_options.js"></script>
78 <script src="chromeos/proxy_rules_list.js"></script> 81 <script src="chrome://resources/js/chromeos/proxy_rules_list.js"></script>
79 <script src="chromeos/accounts_user_list.js"></script> 82 <script src="chrome://resources/js/chromeos/accounts_user_list.js"></script>
80 <script src="chromeos/accounts_user_name_edit.js"></script> 83 <script src="chrome://resources/js/chromeos/accounts_user_name_edit.js"></scri pt>
81 <script> 84 <script src="chrome://resources/js/options/options_variables.js"></script>
82 var AboutPage = options.AboutPage;
83 var AccountsOptions = options.AccountsOptions;
84 var ChangePictureOptions = options.ChangePictureOptions;
85 var InternetOptions = options.InternetOptions;
86 var SystemOptions = options.SystemOptions;
87 </script>
88 </if> 85 </if>
89 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')"> 86 <if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">
90 <script src="certificate_tree.js"></script> 87 <script src="chrome://resources/js/options/certificate_tree.js"></script>
91 <script src="certificate_manager.js"></script> 88 <script src="chrome://resources/js/options/certificate_manager.js"></script>
92 <script src="certificate_restore_overlay.js"></script> 89 <script src="chrome://resources/js/options/certificate_restore_overlay.js"></s cript>
93 <script src="certificate_backup_overlay.js"></script> 90 <script src="chrome://resources/js/options/certificate_backup_overlay.js"></sc ript>
94 <script src="certificate_edit_ca_trust_overlay.js"></script> 91 <script src="chrome://resources/js/options/certificate_edit_ca_trust_overlay.j s"></script>
95 <script src="certificate_import_error_overlay.js"></script> 92 <script src="chrome://resources/js/options/certificate_import_error_overlay.js "></script>
96 <script> 93 <script src="chrome://resources/js/options/certificate_variables.js"></script>
97 var CertificateManager = options.CertificateManager;
98 var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
99 var CertificateBackupOverlay = options.CertificateBackupOverlay;
100 var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
101 var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
102 </script>
103 </if> 94 </if>
104 <script src="advanced_options.js"></script> 95 <script src="chrome://resources/js/options/advanced_options.js"></script>
105 <script src="alert_overlay.js"></script> 96 <script src="chrome://resources/js/options/alert_overlay.js"></script>
106 <script src="autocomplete_list.js"></script> 97 <script src="chrome://resources/js/options/autocomplete_list.js"></script>
107 <script src="autofill_edit_address_overlay.js"></script> 98 <script src="chrome://resources/js/options/autofill_edit_address_overlay.js"></s cript>
108 <script src="autofill_edit_creditcard_overlay.js"></script> 99 <script src="chrome://resources/js/options/autofill_edit_creditcard_overlay.js"> </script>
109 <script src="autofill_options_list.js"></script> 100 <script src="chrome://resources/js/options/autofill_options_list.js"></script>
110 <script src="autofill_options.js"></script> 101 <script src="chrome://resources/js/options/autofill_options.js"></script>
111 <script src="browser_options.js"></script> 102 <script src="chrome://resources/js/options/browser_options.js"></script>
112 <script src="browser_options_startup_page_list.js"></script> 103 <script src="chrome://resources/js/options/browser_options_startup_page_list.js" ></script>
113 <script src="clear_browser_data_overlay.js"></script> 104 <script src="chrome://resources/js/options/clear_browser_data_overlay.js"></scri pt>
114 <script src="content_settings.js"></script> 105 <script src="chrome://resources/js/options/content_settings.js"></script>
115 <script src="content_settings_exceptions_area.js"></script> 106 <script src="chrome://resources/js/options/content_settings_exceptions_area.js"> </script>
116 <script src="content_settings_ui.js"></script> 107 <script src="chrome://resources/js/options/content_settings_ui.js"></script>
117 <script src="cookies_list.js"></script> 108 <script src="chrome://resources/js/options/cookies_list.js"></script>
118 <script src="cookies_view.js"></script> 109 <script src="chrome://resources/js/options/cookies_view.js"></script>
119 <script src="font_settings.js"></script> 110 <script src="chrome://resources/js/options/font_settings.js"></script>
120 <script src="import_data_overlay.js"></script> 111 <script src="chrome://resources/js/options/import_data_overlay.js"></script>
121 <script src="instant_confirm_overlay.js"></script> 112 <script src="chrome://resources/js/options/instant_confirm_overlay.js"></script>
122 <script src="language_add_language_overlay.js"></script> 113 <script src="chrome://resources/js/options/language_add_language_overlay.js"></s cript>
123 <script src="language_list.js"></script> 114 <script src="chrome://resources/js/options/language_list.js"></script>
124 <script src="language_options.js"></script> 115 <script src="chrome://resources/js/options/language_options.js"></script>
125 <script src="password_manager.js"></script> 116 <script src="chrome://resources/js/options/password_manager.js"></script>
126 <script src="password_manager_list.js"></script> 117 <script src="chrome://resources/js/options/password_manager_list.js"></script>
127 <script src="personal_options.js"></script> 118 <script src="chrome://resources/js/options/personal_options.js"></script>
128 <script src="search_engine_manager.js"></script> 119 <script src="chrome://resources/js/options/search_engine_manager.js"></script>
129 <script src="search_engine_manager_engine_list.js"></script> 120 <script src="chrome://resources/js/options/search_engine_manager_engine_list.js" ></script>
130 <script src="search_page.js"></script> 121 <script src="chrome://resources/js/options/search_page.js"></script>
131 <script src="sync_setup_overlay.js"></script> 122 <script src="chrome://resources/js/options/sync_setup_overlay.js"></script>
132 <script src="options.js"></script> 123 <script src="chrome://resources/js/options/options.js"></script>
133 124
134 </head> 125 </head>
135 <body i18n-values=".style.fontFamily:fontfamily;"> 126 <body i18n-values=".style.fontFamily:fontfamily;">
136 <div class="header"> 127 <div class="header">
137 </div> 128 </div>
138 <div id="overlay" class="overlay transparent" hidden> 129 <div id="overlay" class="overlay transparent" hidden>
139 <include src="alert_overlay.html"> 130 <include src="alert_overlay.html">
140 <include src="autofill_edit_address_overlay.html"> 131 <include src="autofill_edit_address_overlay.html">
141 <include src="autofill_edit_creditcard_overlay.html"> 132 <include src="autofill_edit_creditcard_overlay.html">
142 <include src="clear_browser_data_overlay.html"> 133 <include src="clear_browser_data_overlay.html">
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 <include src="chromeos/language_pinyin_options.html"> 208 <include src="chromeos/language_pinyin_options.html">
218 </if> 209 </if>
219 <include src="cookies_view.html"> 210 <include src="cookies_view.html">
220 <include src="content_settings_exceptions_area.html"> 211 <include src="content_settings_exceptions_area.html">
221 </div> 212 </div>
222 </div> 213 </div>
223 </div> 214 </div>
224 </div> 215 </div>
225 </div> 216 </div>
226 </div> 217 </div>
218 <script src="chrome://settings/strings.js"></script>
219 <script src="chrome://resources/js/i18n_template.js"></script>
220 <script src="chrome://resources/js/i18n_process.js"></script>
227 </body> 221 </body>
228 </html> 222 </html>
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/language_options.js ('k') | chrome/browser/resources/options/options.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698