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

Side by Side Diff: content/renderer/render_frame_impl.cc

Issue 524363003: Changed name of MediaStreamImpl to UserMediaClientImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 unified diff | Download patch
OLDNEW
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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 #include "content/renderer/external_popup_menu.h" 61 #include "content/renderer/external_popup_menu.h"
62 #include "content/renderer/geolocation_dispatcher.h" 62 #include "content/renderer/geolocation_dispatcher.h"
63 #include "content/renderer/history_controller.h" 63 #include "content/renderer/history_controller.h"
64 #include "content/renderer/history_serialization.h" 64 #include "content/renderer/history_serialization.h"
65 #include "content/renderer/image_loading_helper.h" 65 #include "content/renderer/image_loading_helper.h"
66 #include "content/renderer/ime_event_guard.h" 66 #include "content/renderer/ime_event_guard.h"
67 #include "content/renderer/internal_document_state_data.h" 67 #include "content/renderer/internal_document_state_data.h"
68 #include "content/renderer/media/audio_renderer_mixer_manager.h" 68 #include "content/renderer/media/audio_renderer_mixer_manager.h"
69 #include "content/renderer/media/crypto/encrypted_media_player_support_impl.h" 69 #include "content/renderer/media/crypto/encrypted_media_player_support_impl.h"
70 #include "content/renderer/media/media_stream_dispatcher.h" 70 #include "content/renderer/media/media_stream_dispatcher.h"
71 #include "content/renderer/media/media_stream_impl.h"
72 #include "content/renderer/media/media_stream_renderer_factory.h" 71 #include "content/renderer/media/media_stream_renderer_factory.h"
73 #include "content/renderer/media/midi_dispatcher.h" 72 #include "content/renderer/media/midi_dispatcher.h"
74 #include "content/renderer/media/render_media_log.h" 73 #include "content/renderer/media/render_media_log.h"
74 #include "content/renderer/media/user_media_client_impl.h"
75 #include "content/renderer/media/webcontentdecryptionmodule_impl.h" 75 #include "content/renderer/media/webcontentdecryptionmodule_impl.h"
76 #include "content/renderer/media/webmediaplayer_impl.h" 76 #include "content/renderer/media/webmediaplayer_impl.h"
77 #include "content/renderer/media/webmediaplayer_ms.h" 77 #include "content/renderer/media/webmediaplayer_ms.h"
78 #include "content/renderer/media/webmediaplayer_params.h" 78 #include "content/renderer/media/webmediaplayer_params.h"
79 #include "content/renderer/notification_permission_dispatcher.h" 79 #include "content/renderer/notification_permission_dispatcher.h"
80 #include "content/renderer/notification_provider.h" 80 #include "content/renderer/notification_provider.h"
81 #include "content/renderer/npapi/plugin_channel_host.h" 81 #include "content/renderer/npapi/plugin_channel_host.h"
82 #include "content/renderer/push_messaging_dispatcher.h" 82 #include "content/renderer/push_messaging_dispatcher.h"
83 #include "content/renderer/render_frame_proxy.h" 83 #include "content/renderer/render_frame_proxy.h"
84 #include "content/renderer/render_process.h" 84 #include "content/renderer/render_process.h"
(...skipping 3662 matching lines...) Expand 10 before | Expand all | Expand 10 after
3747 if (!RenderThreadImpl::current()) // Will be NULL during unit tests. 3747 if (!RenderThreadImpl::current()) // Will be NULL during unit tests.
3748 return; 3748 return;
3749 3749
3750 #if defined(OS_ANDROID) 3750 #if defined(OS_ANDROID)
3751 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebRTC)) 3751 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableWebRTC))
3752 return; 3752 return;
3753 #endif 3753 #endif
3754 3754
3755 #if defined(ENABLE_WEBRTC) 3755 #if defined(ENABLE_WEBRTC)
3756 DCHECK(!web_user_media_client_); 3756 DCHECK(!web_user_media_client_);
3757 web_user_media_client_ = new MediaStreamImpl( 3757 web_user_media_client_ = new UserMediaClientImpl(
3758 this, 3758 this,
3759 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(), 3759 RenderThreadImpl::current()->GetPeerConnectionDependencyFactory(),
3760 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass()); 3760 make_scoped_ptr(new MediaStreamDispatcher(this)).Pass());
3761 #endif 3761 #endif
3762 } 3762 }
3763 3763
3764 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream( 3764 WebMediaPlayer* RenderFrameImpl::CreateWebMediaPlayerForMediaStream(
3765 const blink::WebURL& url, 3765 const blink::WebURL& url,
3766 WebMediaPlayerClient* client) { 3766 WebMediaPlayerClient* client) {
3767 #if defined(ENABLE_WEBRTC) 3767 #if defined(ENABLE_WEBRTC)
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
3849 3849
3850 #if defined(ENABLE_BROWSER_CDMS) 3850 #if defined(ENABLE_BROWSER_CDMS)
3851 RendererCdmManager* RenderFrameImpl::GetCdmManager() { 3851 RendererCdmManager* RenderFrameImpl::GetCdmManager() {
3852 if (!cdm_manager_) 3852 if (!cdm_manager_)
3853 cdm_manager_ = new RendererCdmManager(this); 3853 cdm_manager_ = new RendererCdmManager(this);
3854 return cdm_manager_; 3854 return cdm_manager_;
3855 } 3855 }
3856 #endif // defined(ENABLE_BROWSER_CDMS) 3856 #endif // defined(ENABLE_BROWSER_CDMS)
3857 3857
3858 } // namespace content 3858 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698