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

Side by Side Diff: chrome/chrome.gyp

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/ui/webui/options/options_ui.cc ('k') | chrome/common/common_resources.grd » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 7
8 'variables': { 8 'variables': {
9 'version_py_path': 'tools/build/version.py', 9 'version_py_path': 'tools/build/version.py',
10 'version_path': 'VERSION', 10 'version_path': 'VERSION',
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 'includes': [ '../build/grit_action.gypi' ], 300 'includes': [ '../build/grit_action.gypi' ],
301 }, 301 },
302 { 302 {
303 'action_name': 'net_internals_resources', 303 'action_name': 'net_internals_resources',
304 'variables': { 304 'variables': {
305 'grit_grd_file': 'browser/resources/net_internals_resources.grd', 305 'grit_grd_file': 'browser/resources/net_internals_resources.grd',
306 }, 306 },
307 'includes': [ '../build/grit_action.gypi' ], 307 'includes': [ '../build/grit_action.gypi' ],
308 }, 308 },
309 { 309 {
310 'action_name': 'options_resources',
311 'variables': {
312 'grit_grd_file': 'browser/resources/options_resources.grd',
313 },
314 'includes': [ '../build/grit_action.gypi' ],
315 },
316 {
310 'action_name': 'shared_resources', 317 'action_name': 'shared_resources',
311 'variables': { 318 'variables': {
312 'grit_grd_file': 'browser/resources/shared_resources.grd', 319 'grit_grd_file': 'browser/resources/shared_resources.grd',
313 }, 320 },
314 'includes': [ '../build/grit_action.gypi' ], 321 'includes': [ '../build/grit_action.gypi' ],
315 }, 322 },
316 { 323 {
317 'action_name': 'sync_internals_resources', 324 'action_name': 'sync_internals_resources',
318 'variables': { 325 'variables': {
319 'grit_grd_file': 'browser/resources/sync_internals_resources.grd', 326 'grit_grd_file': 'browser/resources/sync_internals_resources.grd',
(...skipping 871 matching lines...) Expand 10 before | Expand all | Expand 10 after
1191 'chrome_extra_resources', 1198 'chrome_extra_resources',
1192 ], 1199 ],
1193 'actions': [ 1200 'actions': [
1194 { 1201 {
1195 'action_name': 'repack_resources', 1202 'action_name': 'repack_resources',
1196 'variables': { 1203 'variables': {
1197 'pak_inputs': [ 1204 'pak_inputs': [
1198 '<(grit_out_dir)/component_extension_resources.pak', 1205 '<(grit_out_dir)/component_extension_resources.pak',
1199 '<(grit_out_dir)/devtools_frontend_resources.pak', 1206 '<(grit_out_dir)/devtools_frontend_resources.pak',
1200 '<(grit_out_dir)/devtools_resources.pak', 1207 '<(grit_out_dir)/devtools_resources.pak',
1208 '<(grit_out_dir)/options_resources.pak',
1201 '<(grit_out_dir)/net_internals_resources.pak', 1209 '<(grit_out_dir)/net_internals_resources.pak',
1202 '<(grit_out_dir)/shared_resources.pak', 1210 '<(grit_out_dir)/shared_resources.pak',
1203 '<(grit_out_dir)/sync_internals_resources.pak', 1211 '<(grit_out_dir)/sync_internals_resources.pak',
1204 ], 1212 ],
1205 }, 1213 },
1206 'inputs': [ 1214 'inputs': [
1207 '<(repack_path)', 1215 '<(repack_path)',
1208 '<@(pak_inputs)', 1216 '<@(pak_inputs)',
1209 ], 1217 ],
1210 'outputs': [ 1218 'outputs': [
(...skipping 410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1621 }], # targets 1629 }], # targets
1622 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" 1630 }], # OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"
1623 ], # 'conditions' 1631 ], # 'conditions'
1624 } 1632 }
1625 1633
1626 # Local Variables: 1634 # Local Variables:
1627 # tab-width:2 1635 # tab-width:2
1628 # indent-tabs-mode:nil 1636 # indent-tabs-mode:nil
1629 # End: 1637 # End:
1630 # vim: set expandtab tabstop=2 shiftwidth=2: 1638 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/options/options_ui.cc ('k') | chrome/common/common_resources.grd » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698