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

Side by Side Diff: content/content_common.gypi

Issue 10824168: Cleaning up compositing field trial code and enable FCM in beta/stable (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: revert some.gyp Created 8 years, 4 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'dependencies': [ 6 'dependencies': [
7 '../base/base.gyp:base', 7 '../base/base.gyp:base',
8 '../build/temp_gyp/googleurl.gyp:googleurl', 8 '../build/temp_gyp/googleurl.gyp:googleurl',
9 '../gpu/gpu.gyp:gles2_implementation', 9 '../gpu/gpu.gyp:gles2_implementation',
10 '../gpu/gpu.gyp:gpu_ipc', 10 '../gpu/gpu.gyp:gpu_ipc',
(...skipping 17 matching lines...) Expand all
28 ], 28 ],
29 'export_dependent_settings': [ 29 'export_dependent_settings': [
30 '../base/base.gyp:base', 30 '../base/base.gyp:base',
31 ], 31 ],
32 'sources': [ 32 'sources': [
33 'public/common/bindings_policy.h', 33 'public/common/bindings_policy.h',
34 'public/common/child_process_host.h', 34 'public/common/child_process_host.h',
35 'public/common/child_process_host_delegate.cc', 35 'public/common/child_process_host_delegate.cc',
36 'public/common/child_process_host_delegate.h', 36 'public/common/child_process_host_delegate.h',
37 'public/common/child_process_sandbox_support_linux.h', 37 'public/common/child_process_sandbox_support_linux.h',
38 'public/common/compositor_util.cc',
39 'public/common/compositor_util.h',
38 'public/common/content_constants.cc', 40 'public/common/content_constants.cc',
39 'public/common/content_constants.h', 41 'public/common/content_constants.h',
40 'public/common/content_descriptors.h', 42 'public/common/content_descriptors.h',
41 'public/common/content_paths.h', 43 'public/common/content_paths.h',
42 'public/common/content_restriction.h', 44 'public/common/content_restriction.h',
43 'public/common/content_switches.cc', 45 'public/common/content_switches.cc',
44 'public/common/content_switches.h', 46 'public/common/content_switches.h',
45 'public/common/context_menu_params.cc', 47 'public/common/context_menu_params.cc',
46 'public/common/context_menu_params.h', 48 'public/common/context_menu_params.h',
47 'public/common/console_message_level.h', 49 'public/common/console_message_level.h',
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
499 '../build/extract_from_cab.py', 501 '../build/extract_from_cab.py',
500 '..\\third_party\\directxsdk\\files\\Redist\\<(input)', 502 '..\\third_party\\directxsdk\\files\\Redist\\<(input)',
501 '<(output)', 503 '<(output)',
502 '<(PRODUCT_DIR)', 504 '<(PRODUCT_DIR)',
503 ], 505 ],
504 }, 506 },
505 ] 507 ]
506 }] 508 }]
507 ], 509 ],
508 } 510 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698