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

Side by Side Diff: content/content_common.gypi

Issue 195993010: Adds the ability for the renderer to create the mojo channel (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge to trunk and update ifdefs Created 6 years, 9 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
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 '../components/tracing.gyp:tracing', 8 '../components/tracing.gyp:tracing',
9 '../net/net.gyp:net', 9 '../net/net.gyp:net',
10 '../skia/skia.gyp:skia', 10 '../skia/skia.gyp:skia',
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 'common/media/media_stream_track_metrics_host_messages.h', 317 'common/media/media_stream_track_metrics_host_messages.h',
318 'common/media/midi_messages.h', 318 'common/media/midi_messages.h',
319 'common/media/video_capture.h', 319 'common/media/video_capture.h',
320 'common/media/video_capture_messages.h', 320 'common/media/video_capture_messages.h',
321 'common/media/webrtc_identity_messages.h', 321 'common/media/webrtc_identity_messages.h',
322 'common/memory_benchmark_messages.h', 322 'common/memory_benchmark_messages.h',
323 'common/message_port_messages.h', 323 'common/message_port_messages.h',
324 'common/message_router.cc', 324 'common/message_router.cc',
325 'common/message_router.h', 325 'common/message_router.h',
326 'common/mime_registry_messages.h', 326 'common/mime_registry_messages.h',
327 'common/mojo/mojo_channel_init.cc',
328 'common/mojo/mojo_channel_init.h',
329 'common/mojo/mojo_messages.h',
327 'common/navigation_gesture.h', 330 'common/navigation_gesture.h',
328 'common/net/url_fetcher.cc', 331 'common/net/url_fetcher.cc',
329 'common/net/url_request_user_data.cc', 332 'common/net/url_request_user_data.cc',
330 'common/net/url_request_user_data.h', 333 'common/net/url_request_user_data.h',
331 'common/one_writer_seqlock.cc', 334 'common/one_writer_seqlock.cc',
332 'common/one_writer_seqlock.h', 335 'common/one_writer_seqlock.h',
333 'common/p2p_messages.h', 336 'common/p2p_messages.h',
334 'common/page_state_serialization.cc', 337 'common/page_state_serialization.cc',
335 'common/page_state_serialization.h', 338 'common/page_state_serialization.h',
336 'common/page_zoom.cc', 339 'common/page_zoom.cc',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 '../media/media.gyp:shared_memory_support', 475 '../media/media.gyp:shared_memory_support',
473 '../third_party/WebKit/public/blink.gyp:blink', 476 '../third_party/WebKit/public/blink.gyp:blink',
474 '../ui/gl/gl.gyp:gl', 477 '../ui/gl/gl.gyp:gl',
475 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 478 '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
476 '../webkit/common/webkit_common.gyp:webkit_common', 479 '../webkit/common/webkit_common.gyp:webkit_common',
477 '../webkit/storage_browser.gyp:webkit_storage_browser', 480 '../webkit/storage_browser.gyp:webkit_storage_browser',
478 '../webkit/storage_common.gyp:webkit_storage_common', 481 '../webkit/storage_common.gyp:webkit_storage_common',
479 'content.gyp:webkit_version', 482 'content.gyp:webkit_version',
480 ], 483 ],
481 }], 484 }],
485 # TODO(sky): conditional temporary until mojo is sorted out on mac.
486 ['OS=="mac"', {
487 'sources!': [
488 'common/mojo/mojo_channel_init.cc',
489 'common/mojo/mojo_channel_init.h',
490 ],
491 }, {
492 'dependencies': [
493 '../mojo/mojo.gyp:mojo_environment_chromium',
494 '../mojo/mojo.gyp:mojo_system',
495 '../mojo/mojo.gyp:mojo_system_impl',
496 ],
497 }],
482 ['OS=="mac"', { 498 ['OS=="mac"', {
483 'sources': [ 499 'sources': [
484 'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc', 500 'common/gpu/client/gpu_memory_buffer_impl_io_surface.cc',
485 'common/gpu/client/gpu_memory_buffer_impl_io_surface.h', 501 'common/gpu/client/gpu_memory_buffer_impl_io_surface.h',
486 ], 502 ],
487 'sources!': [ 503 'sources!': [
488 'common/plugin_list_posix.cc', 504 'common/plugin_list_posix.cc',
489 ], 505 ],
490 'link_settings': { 506 'link_settings': {
491 'libraries': [ 507 'libraries': [
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
705 'common/sandbox_linux/bpf_renderer_policy_linux.cc', 721 'common/sandbox_linux/bpf_renderer_policy_linux.cc',
706 'common/sandbox_linux/bpf_renderer_policy_linux.h', 722 'common/sandbox_linux/bpf_renderer_policy_linux.h',
707 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc', 723 'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
708 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h', 724 'common/sandbox_linux/sandbox_bpf_base_policy_linux.h',
709 ], 725 ],
710 }, { 726 }, {
711 'defines': ['USE_SECCOMP_BPF'], 727 'defines': ['USE_SECCOMP_BPF'],
712 }], 728 }],
713 ], 729 ],
714 } 730 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698