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

Unified Diff: content/renderer/render_thread_impl.h

Issue 462983002: GN: Make content_shell and webkit_unit_tests work in component build (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/render_thread_impl.h
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 012e2a2db9d9e1a973682e6dd8ff2fa67e2a3e0b..68828f67cb87210463264b595da4765f758ac17b 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -270,6 +270,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
blink::WebMediaStreamCenter* CreateMediaStreamCenter(
blink::WebMediaStreamCenterClient* client);
+#if defined(ENABLE_WEBRTC)
jamesr 2014/08/12 04:03:08 the changes in these source files make content/ wo
// Returns a factory used for creating RTC PeerConnection objects.
PeerConnectionDependencyFactory* GetPeerConnectionDependencyFactory();
@@ -281,6 +282,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
P2PSocketDispatcher* p2p_socket_dispatcher() {
return p2p_socket_dispatcher_.get();
}
+#endif
VideoCaptureImplManager* video_capture_impl_manager() const {
return vc_manager_.get();
@@ -473,6 +475,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
#endif
scoped_refptr<DevToolsAgentFilter> devtools_agent_message_filter_;
+#if defined(ENABLE_WEBRTC)
scoped_ptr<PeerConnectionDependencyFactory> peer_connection_factory_;
// This is used to communicate to the browser process the status
@@ -481,6 +484,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
// Dispatches all P2P sockets.
scoped_refptr<P2PSocketDispatcher> p2p_socket_dispatcher_;
+#endif
// Used on the render thread.
scoped_ptr<VideoCaptureImplManager> vc_manager_;
@@ -552,7 +556,9 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread,
scoped_ptr<base::MemoryPressureListener> memory_pressure_listener_;
+#if defined(ENABLE_WEBRTC)
scoped_ptr<WebRTCIdentityService> webrtc_identity_service_;
+#endif
// TODO(reveman): Allow AllocateGpuMemoryBuffer to be called from
// multiple threads. Current allocation mechanism for IOSurface

Powered by Google App Engine
This is Rietveld 408576698