content/content_renderer.gypi - Issue 6882021: Wrap the p2p transport API in a compile time flag.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/content_renderer.gypi

Issue 6882021: Wrap the p2p transport API in a compile time flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 9 years, 8 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

Index: content/content_renderer.gypi

diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi

index dcc304e5edac719bf6e7c54226e384d04756ba2a..53f1b9762ceb9b8bfb9eedf31e7304f858210ac6 100644

--- a/content/content_renderer.gypi

+++ b/content/content_renderer.gypi

@@ -64,16 +64,6 @@

'renderer/navigation_state.h',

'renderer/notification_provider.cc',

'renderer/notification_provider.h',

- 'renderer/p2p/ipc_network_manager.cc',

- 'renderer/p2p/ipc_network_manager.h',

- 'renderer/p2p/ipc_socket_factory.cc',

- 'renderer/p2p/ipc_socket_factory.h',

- 'renderer/p2p/p2p_transport_impl.cc',

- 'renderer/p2p/p2p_transport_impl.h',

- 'renderer/p2p/socket_client.cc',

- 'renderer/p2p/socket_client.h',

- 'renderer/p2p/socket_dispatcher.cc',

- 'renderer/p2p/socket_dispatcher.h',

'renderer/paint_aggregator.cc',

'renderer/paint_aggregator.h',

'renderer/pepper_platform_context_3d_impl.cc',

@@ -162,6 +152,20 @@

'renderer/web_ui_bindings.h',

'conditions': [

+ ['p2p_apis==1', {

+ 'sources': [

+ 'renderer/p2p/ipc_network_manager.cc',

+ 'renderer/p2p/ipc_network_manager.h',

+ 'renderer/p2p/ipc_socket_factory.cc',

+ 'renderer/p2p/ipc_socket_factory.h',

+ 'renderer/p2p/p2p_transport_impl.cc',

+ 'renderer/p2p/p2p_transport_impl.h',

+ 'renderer/p2p/socket_client.cc',

+ 'renderer/p2p/socket_client.h',

+ 'renderer/p2p/socket_dispatcher.cc',

+ 'renderer/p2p/socket_dispatcher.h',

+ ],

+ }],

['enable_gpu==1', {

'dependencies': [

'../gpu/gpu.gyp:gles2_c_lib',

« content/common/content_switches.cc ('K') | « content/content_browser.gypi ('k') | content/renderer/pepper_plugin_delegate_impl.cc » ('j') | webkit/plugins/ppapi/plugin_module.cc » ('J')