OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 #include "content/renderer/render_frame_impl.h" | 5 #include "content/renderer/render_frame_impl.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
(...skipping 3384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3395 | 3395 |
3396 #if defined(ENABLE_WEBRTC) | 3396 #if defined(ENABLE_WEBRTC) |
3397 if (!render_view_->media_stream_dispatcher_) { | 3397 if (!render_view_->media_stream_dispatcher_) { |
3398 render_view_->media_stream_dispatcher_ = | 3398 render_view_->media_stream_dispatcher_ = |
3399 new MediaStreamDispatcher(render_view_.get()); | 3399 new MediaStreamDispatcher(render_view_.get()); |
3400 } | 3400 } |
3401 | 3401 |
3402 MediaStreamImpl* media_stream_impl = new MediaStreamImpl( | 3402 MediaStreamImpl* media_stream_impl = new MediaStreamImpl( |
3403 render_view_.get(), | 3403 render_view_.get(), |
3404 render_view_->media_stream_dispatcher_, | 3404 render_view_->media_stream_dispatcher_, |
3405 RenderThreadImpl::current()->GetMediaStreamDependencyFactory()); | 3405 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory()); |
3406 media_stream_client_ = media_stream_impl; | 3406 media_stream_client_ = media_stream_impl; |
3407 web_user_media_client_ = media_stream_impl; | 3407 web_user_media_client_ = media_stream_impl; |
3408 return true; | 3408 return true; |
3409 #else | 3409 #else |
3410 return false; | 3410 return false; |
3411 #endif | 3411 #endif |
3412 } | 3412 } |
3413 | 3413 |
3414 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( | 3414 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( |
3415 const blink::WebURL& url, | 3415 const blink::WebURL& url, |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3470 weak_factory_.GetWeakPtr(), | 3470 weak_factory_.GetWeakPtr(), |
3471 render_view_->media_player_manager_, | 3471 render_view_->media_player_manager_, |
3472 stream_texture_factory, | 3472 stream_texture_factory, |
3473 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), | 3473 RenderThreadImpl::current()->GetMediaThreadMessageLoopProxy(), |
3474 new RenderMediaLog()); | 3474 new RenderMediaLog()); |
3475 } | 3475 } |
3476 | 3476 |
3477 #endif | 3477 #endif |
3478 | 3478 |
3479 } // namespace content | 3479 } // namespace content |
OLD | NEW |