| Index: content/renderer/render_view_impl.cc
|
| diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
|
| index aa61f8ca9f634db94875cb9ff6f1bbb5ddd8f8ef..346ef2d64f7330af78f71a9257d00c18ba56e788 100644
|
| --- a/content/renderer/render_view_impl.cc
|
| +++ b/content/renderer/render_view_impl.cc
|
| @@ -215,11 +215,15 @@ using WebKit::WebIntentServiceInfo;
|
| using WebKit::WebMediaPlayer;
|
| using WebKit::WebMediaPlayerAction;
|
| using WebKit::WebMediaPlayerClient;
|
| +using WebKit::WebMediaStreamCenter;
|
| +using WebKit::WebMediaStreamCenterClient;
|
| using WebKit::WebNavigationPolicy;
|
| using WebKit::WebNavigationType;
|
| using WebKit::WebNode;
|
| using WebKit::WebPageSerializer;
|
| using WebKit::WebPageSerializerClient;
|
| +using WebKit::WebPeerConnectionHandler;
|
| +using WebKit::WebPeerConnectionHandlerClient;
|
| using WebKit::WebPlugin;
|
| using WebKit::WebPluginAction;
|
| using WebKit::WebPluginContainer;
|
| @@ -618,8 +622,8 @@ RenderViewImpl* RenderViewImpl::Create(
|
| next_page_id); // adds reference
|
| }
|
|
|
| -WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler(
|
| - WebKit::WebPeerConnectionHandlerClient* client) {
|
| +WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler(
|
| + WebPeerConnectionHandlerClient* client) {
|
| const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
|
| if (!cmd_line->HasSwitch(switches::kEnableMediaStream))
|
| return NULL;
|
| @@ -629,6 +633,15 @@ WebKit::WebPeerConnectionHandler* RenderViewImpl::CreatePeerConnectionHandler(
|
| return media_stream_impl_->CreatePeerConnectionHandler(client);
|
| }
|
|
|
| +WebMediaStreamCenter* RenderViewImpl::CreateMediaStreamCenter(
|
| + WebMediaStreamCenterClient* client) {
|
| + const CommandLine* cmd_line = CommandLine::ForCurrentProcess();
|
| + if (!cmd_line->HasSwitch(switches::kEnableMediaStream))
|
| + return NULL;
|
| + EnsureMediaStreamImpl();
|
| + return media_stream_impl_->CreateMediaStreamCenter(client);
|
| +}
|
| +
|
| void RenderViewImpl::AddObserver(RenderViewObserver* observer) {
|
| observers_.AddObserver(observer);
|
| }
|
|
|