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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/shared_resources.grd

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/shared/js/options/sync_setup_overlay.js ('k') | chrome/browser/resources/webui.css » ('j') | chrome/browser/ui/webui/options/options_ui.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/shared_resources.grd
===================================================================
--- chrome/browser/resources/shared_resources.grd (revision 84688)
+++ chrome/browser/resources/shared_resources.grd (working copy)
@@ -30,6 +30,8 @@
file="shared/css/tree.css" type="BINDATA" />
<include name="IDR_SHARED_CSS_TREE_JS"
file="shared/css/tree.css.js" type="BINDATA" />
+ <include name="IDR_SHARED_CSS_WEBUI"
+ file="shared/css/webui.css" type="BINDATA" />
<include name="IDR_SHARED_IMAGES_ACTIVE_DOWNLOADS_MENU"
file="shared/images/active_downloads_menu.png" type="BINDATA" />
<include name="IDR_SHARED_IMAGES_ICON_FILE"
@@ -114,14 +116,124 @@
file="shared/js/cr/ui/tabs.js" type="BINDATA" />
<include name="IDR_SHARED_JS_CR_UI_TREE"
file="shared/js/cr/ui/tree.js" type="BINDATA" />
+ <if expr="pp_ifdef('chromeos')">
+ <include name="IDR_SHARED_JS_CHROMEOS_ACCOUNTS_OPTIONS"
+ file="shared/js/chromeos/accounts_options.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CHROMEOS_ACCOUNTS_USER_LIST"
+ file="shared/js/chromeos/accounts_user_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CHROMEOS_ACCOUNTS_USER_NAME_EDIT"
+ file="shared/js/chromeos/accounts_user_name_edit.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CHROMEOS_CELLULAR_PLAN_ELEMENT"
+ file="shared/js/chromeos/cellular_plan_element.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CHROMEOS_CHANGE_PICTURE_OPTIONS"
+ file="shared/js/chromeos/change_picture_options.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CHROMEOS_INTERNET_NETWORK_ELEMENT"
+ file="shared/js/chromeos/internet_network_element.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CHROMEOS_INTERNET_OPTIONS"
+ file="shared/js/chromeos/internet_options.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CHROMEOS_PROXY_OPTIONS"
+ file="shared/js/chromeos/proxy_options.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CHROMEOS_PROXY_RULES_LIST"
+ file="shared/js/chromeos/proxy_rules_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_CHROMEOS_SYSTEM_OPTIONS"
+ file="shared/js/chromeos/system_options.js" type="BINDATA" />
+ </if>
<include name="IDR_SHARED_JS_EVENT_TRACKER"
file="shared/js/event_tracker.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_I18N_PROCESS"
+ file="shared/js/i18n_process.js" type="BINDATA" />
<include name="IDR_SHARED_JS_I18N_TEMPLATE"
file="shared/js/i18n_template.js" type="BINDATA" />
<include name="IDR_SHARED_JS_LOCAL_STRINGS"
file="shared/js/local_strings.js" type="BINDATA" />
<include name="IDR_SHARED_JS_MEDIA_COMMON"
file="shared/js/media_common.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_ABOUT_PAGE"
+ file="shared/js/options/about_page.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_ADVANCED_OPTIONS"
+ file="shared/js/options/advanced_options.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_ALERT_OVERLAY"
+ file="shared/js/options/alert_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_AUTOCOMPLETE_LIST"
+ file="shared/js/options/autocomplete_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_AUTOFILL_EDIT_ADDRESS_OVERLAY"
+ file="shared/js/options/autofill_edit_address_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_AUTOFILL_EDIT_CREDITCARD_OVERLAY"
+ file="shared/js/options/autofill_edit_creditcard_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_AUTOFILL_OPTIONS"
+ file="shared/js/options/autofill_options.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_AUTOFILL_OPTIONS_LIST"
+ file="shared/js/options/autofill_options_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_BROWSER_OPTIONS"
+ file="shared/js/options/browser_options.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_BROWSER_OPTIONS_STARTUP_PAGE_LIST"
+ file="shared/js/options/browser_options_startup_page_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CERTIFICATE_BACKUP_OVERLAY"
+ file="shared/js/options/certificate_backup_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CERTIFICATE_EDIT_CA_TRUST_OVERLAY"
+ file="shared/js/options/certificate_edit_ca_trust_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CERTIFICATE_IMPORT_ERROR_OVERLAY"
+ file="shared/js/options/certificate_import_error_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CERTIFICATE_MANAGER"
+ file="shared/js/options/certificate_manager.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CERTIFICATE_RESTORE_OVERLAY"
+ file="shared/js/options/certificate_restore_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CERTIFICATE_TREE"
+ file="shared/js/options/certificate_tree.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CERTIFICATE_VARIABLES"
+ file="shared/js/options/certificate_variables.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CLEAR_BROWSER_DATA_OVERLAY"
+ file="shared/js/options/clear_browser_data_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CONTENT_SETTINGS"
+ file="shared/js/options/content_settings.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CONTENT_SETTINGS_EXCEPTIONS_AREA"
+ file="shared/js/options/content_settings_exceptions_area.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_CONTENT_SETTINGS_UI"
+ file="shared/js/options/content_settings_ui.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_COOKIES_LIST"
+ file="shared/js/options/cookies_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_COOKIES_VIEW"
+ file="shared/js/options/cookies_view.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_DELETABLE_ITEM_LIST"
+ file="shared/js/options/deletable_item_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_FONT_SETTINGS"
+ file="shared/js/options/font_settings.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_IMPORT_DATA_OVERLAY"
+ file="shared/js/options/import_data_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_INLINE_EDITABLE_LIST"
+ file="shared/js/options/inline_editable_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_INSTANT_CONFIRM_OVERLAY"
+ file="shared/js/options/instant_confirm_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_LANGUAGE_ADD_LANGUAGE_OVERLAY"
+ file="shared/js/options/language_add_language_overlay.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_LANGUAGE_LIST"
+ file="shared/js/options/language_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_LANGUAGE_OPTIONS"
+ file="shared/js/options/language_options.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_OPTIONS"
+ file="shared/js/options/options.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_OPTIONS_PAGE"
+ file="shared/js/options/options_page.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_OPTIONS_VARIABLES"
+ file="shared/js/options/options_variables.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_PASSWORD_MANAGER"
+ file="shared/js/options/password_manager.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_PASSWORD_MANAGER_LIST"
+ file="shared/js/options/password_manager_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_PERSONAL_OPTIONS"
+ file="shared/js/options/personal_options.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_PREF_UI"
+ file="shared/js/options/pref_ui.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_PREFERENCES"
+ file="shared/js/options/preferences.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_SEARCH_ENGINE_MANAGER"
+ file="shared/js/options/search_engine_manager.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_SEARCH_ENGINE_MANAGER_ENGINE_LIST"
+ file="shared/js/options/search_engine_manager_engine_list.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_SEARCH_PAGE"
+ file="shared/js/options/search_page.js" type="BINDATA" />
+ <include name="IDR_SHARED_JS_OPTIONS_SYNC_SETUP_OVERLAY"
+ file="shared/js/options/sync_setup_overlay.js" type="BINDATA" />
<include name="IDR_SHARED_JS_PARSE_HTML_SUBSET"
file="shared/js/parse_html_subset.js" type="BINDATA" />
<include name="IDR_SHARED_JS_UTIL"
« no previous file with comments | « chrome/browser/resources/shared/js/options/sync_setup_overlay.js ('k') | chrome/browser/resources/webui.css » ('j') | chrome/browser/ui/webui/options/options_ui.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698