Index: content/renderer/render_view_impl.cc |
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc |
index bf8acfc3fa64e7db27ff643aa0a2cd325d44ef69..236f2af96f00b43f67a4ef8b89eebf31b9100048 100644 |
--- a/content/renderer/render_view_impl.cc |
+++ b/content/renderer/render_view_impl.cc |
@@ -138,6 +138,8 @@ |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebDragData.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebGraphicsContext3D.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebImage.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnection00Handler.h" |
+#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnection00HandlerClient.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandler.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPeerConnectionHandlerClient.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebPoint.h" |
@@ -664,6 +666,18 @@ WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler( |
return media_stream_impl_->CreatePeerConnectionHandler(client); |
} |
+WebKit::WebPeerConnection00Handler* |
darin (slow to review)
2012/04/04 18:16:44
nit: normally, we add a using declaration at the t
Henrik Grunell
2012/04/10 20:20:25
Done.
|
+RenderViewImpl::CreatePeerConnectionHandlerJsep( |
+ WebKit::WebPeerConnection00HandlerClient* client) { |
+ const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
+ if (!cmd_line->HasSwitch(switches::kEnableMediaStream)) |
darin (slow to review)
2012/04/04 18:16:44
nit: how about moving this command line check into
Henrik Grunell
2012/04/10 20:20:25
Done.
|
+ return NULL; |
+ EnsureMediaStreamImpl(); |
+ if (!media_stream_impl_.get()) |
+ return NULL; |
+ return media_stream_impl_->CreatePeerConnectionHandlerJsep(client); |
+} |
+ |
void RenderViewImpl::AddObserver(RenderViewObserver* observer) { |
observers_.AddObserver(observer); |
} |