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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/options/options.html
===================================================================
--- chrome/browser/resources/options/options.html (revision 84868)
+++ chrome/browser/resources/options/options.html (working copy)
@@ -4,6 +4,9 @@
id="t">
<head>
<meta charset="utf-8">
+<!-- X-WebKit-CSP is our development name for Content-Security-Policy.
+ TODO(tsepez) rename when Content-security-policy is done. -->
+<meta http-equiv="X-WebKit-CSP" content="object-src 'none'; script-src chrome://resources chrome://settings">
<!-- Set the title to that of the default page so that the title doesn't flash
on load (for the most common case). -->
<title i18n-content="browserPageTabTitle"></title>
@@ -61,75 +64,63 @@
<script src="chrome://resources/js/cr/ui/tree.js"></script>
<script src="chrome://resources/js/local_strings.js"></script>
<script src="chrome://resources/js/util.js"></script>
-<script src="preferences.js"></script>
-<script src="pref_ui.js"></script>
-<script src="deletable_item_list.js"></script>
-<script src="inline_editable_list.js"></script>
-<script src="options_page.js"></script>
+<script src="chrome://resources/js/options/preferences.js"></script>
+<script src="chrome://resources/js/options/pref_ui.js"></script>
+<script src="chrome://resources/js/options/deletable_item_list.js"></script>
+<script src="chrome://resources/js/options/inline_editable_list.js"></script>
+<script src="chrome://resources/js/options/options_page.js"></script>
<if expr="pp_ifdef('chromeos')">
- <script src="about_page.js"></script>
- <script src="chromeos/cellular_plan_element.js"></script>
- <script src="chromeos/change_picture_options.js"></script>
- <script src="chromeos/internet_network_element.js"></script>
- <script src="chromeos/internet_options.js"></script>
- <script src="chromeos/system_options.js"></script>
- <script src="chromeos/accounts_options.js"></script>
- <script src="chromeos/proxy_options.js"></script>
- <script src="chromeos/proxy_rules_list.js"></script>
- <script src="chromeos/accounts_user_list.js"></script>
- <script src="chromeos/accounts_user_name_edit.js"></script>
- <script>
- var AboutPage = options.AboutPage;
- var AccountsOptions = options.AccountsOptions;
- var ChangePictureOptions = options.ChangePictureOptions;
- var InternetOptions = options.InternetOptions;
- var SystemOptions = options.SystemOptions;
- </script>
+ <script src="chrome://resources/js/chrome://resources/js/options/about_page.js"></script>
Evan Stade 2011/05/11 18:01:39 what
+ <script src="chrome://resources/js/chromeos/cellular_plan_element.js"></script>
+ <script src="chrome://resources/js/chromeos/change_picture_options.js"></script>
+ <script src="chrome://resources/js/chromeos/internet_network_element.js"></script>
+ <script src="chrome://resources/js/chromeos/internet_options.js"></script>
+ <script src="chrome://resources/js/chromeos/system_options.js"></script>
+ <script src="chrome://resources/js/chromeos/accounts_options.js"></script>
+ <script src="chrome://resources/js/chromeos/proxy_options.js"></script>
+ <script src="chrome://resources/js/chromeos/proxy_rules_list.js"></script>
+ <script src="chrome://resources/js/chromeos/accounts_user_list.js"></script>
+ <script src="chrome://resources/js/chromeos/accounts_user_name_edit.js"></script>
+ <script src="chrome://resources/js/options/options_variables.js"></script>
</if>
<if expr="not pp_ifdef('win32') and not pp_ifdef('darwin')">
- <script src="certificate_tree.js"></script>
- <script src="certificate_manager.js"></script>
- <script src="certificate_restore_overlay.js"></script>
- <script src="certificate_backup_overlay.js"></script>
- <script src="certificate_edit_ca_trust_overlay.js"></script>
- <script src="certificate_import_error_overlay.js"></script>
- <script>
- var CertificateManager = options.CertificateManager;
- var CertificateRestoreOverlay = options.CertificateRestoreOverlay;
- var CertificateBackupOverlay = options.CertificateBackupOverlay;
- var CertificateEditCaTrustOverlay = options.CertificateEditCaTrustOverlay;
- var CertificateImportErrorOverlay = options.CertificateImportErrorOverlay;
- </script>
+ <script src="chrome://resources/js/options/certificate_tree.js"></script>
+ <script src="chrome://resources/js/options/certificate_manager.js"></script>
+ <script src="chrome://resources/js/options/certificate_restore_overlay.js"></script>
+ <script src="chrome://resources/js/options/certificate_backup_overlay.js"></script>
+ <script src="chrome://resources/js/options/certificate_edit_ca_trust_overlay.js"></script>
+ <script src="chrome://resources/js/options/certificate_import_error_overlay.js"></script>
+ <script src="chrome://resources/js/options/certificate_variables.js"></script>
</if>
-<script src="advanced_options.js"></script>
-<script src="alert_overlay.js"></script>
-<script src="autocomplete_list.js"></script>
-<script src="autofill_edit_address_overlay.js"></script>
-<script src="autofill_edit_creditcard_overlay.js"></script>
-<script src="autofill_options_list.js"></script>
-<script src="autofill_options.js"></script>
-<script src="browser_options.js"></script>
-<script src="browser_options_startup_page_list.js"></script>
-<script src="clear_browser_data_overlay.js"></script>
-<script src="content_settings.js"></script>
-<script src="content_settings_exceptions_area.js"></script>
-<script src="content_settings_ui.js"></script>
-<script src="cookies_list.js"></script>
-<script src="cookies_view.js"></script>
-<script src="font_settings.js"></script>
-<script src="import_data_overlay.js"></script>
-<script src="instant_confirm_overlay.js"></script>
-<script src="language_add_language_overlay.js"></script>
-<script src="language_list.js"></script>
-<script src="language_options.js"></script>
-<script src="password_manager.js"></script>
-<script src="password_manager_list.js"></script>
-<script src="personal_options.js"></script>
-<script src="search_engine_manager.js"></script>
-<script src="search_engine_manager_engine_list.js"></script>
-<script src="search_page.js"></script>
-<script src="sync_setup_overlay.js"></script>
-<script src="options.js"></script>
+<script src="chrome://resources/js/options/advanced_options.js"></script>
+<script src="chrome://resources/js/options/alert_overlay.js"></script>
+<script src="chrome://resources/js/options/autocomplete_list.js"></script>
+<script src="chrome://resources/js/options/autofill_edit_address_overlay.js"></script>
+<script src="chrome://resources/js/options/autofill_edit_creditcard_overlay.js"></script>
+<script src="chrome://resources/js/options/autofill_options_list.js"></script>
+<script src="chrome://resources/js/options/autofill_options.js"></script>
+<script src="chrome://resources/js/options/browser_options.js"></script>
+<script src="chrome://resources/js/options/browser_options_startup_page_list.js"></script>
+<script src="chrome://resources/js/options/clear_browser_data_overlay.js"></script>
+<script src="chrome://resources/js/options/content_settings.js"></script>
+<script src="chrome://resources/js/options/content_settings_exceptions_area.js"></script>
+<script src="chrome://resources/js/options/content_settings_ui.js"></script>
+<script src="chrome://resources/js/options/cookies_list.js"></script>
+<script src="chrome://resources/js/options/cookies_view.js"></script>
+<script src="chrome://resources/js/options/font_settings.js"></script>
+<script src="chrome://resources/js/options/import_data_overlay.js"></script>
+<script src="chrome://resources/js/options/instant_confirm_overlay.js"></script>
+<script src="chrome://resources/js/options/language_add_language_overlay.js"></script>
+<script src="chrome://resources/js/options/language_list.js"></script>
+<script src="chrome://resources/js/options/language_options.js"></script>
+<script src="chrome://resources/js/options/password_manager.js"></script>
+<script src="chrome://resources/js/options/password_manager_list.js"></script>
+<script src="chrome://resources/js/options/personal_options.js"></script>
+<script src="chrome://resources/js/options/search_engine_manager.js"></script>
+<script src="chrome://resources/js/options/search_engine_manager_engine_list.js"></script>
+<script src="chrome://resources/js/options/search_page.js"></script>
+<script src="chrome://resources/js/options/sync_setup_overlay.js"></script>
+<script src="chrome://resources/js/options/options.js"></script>
</head>
<body i18n-values=".style.fontFamily:fontfamily;">
@@ -224,5 +215,8 @@
</div>
</div>
</div>
+<script src="chrome://settings/strings.js"></script>
+<script src="chrome://resources/js/i18n_template.js"></script>
+<script src="chrome://resources/js/i18n_process.js"></script>
</body>
</html>
« 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