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

Unified Diff: content/renderer/media/user_media_client_impl.h

Issue 562643003: Implement WebUserMediaClient::requestSources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review. 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/user_media_client_impl.h
diff --git a/content/renderer/media/user_media_client_impl.h b/content/renderer/media/user_media_client_impl.h
index 465dad1db33caebecae44bcb17e8dc8ef1654567..a3806642b5e8738fe6d565abee31d23a37152ccb 100644
--- a/content/renderer/media/user_media_client_impl.h
+++ b/content/renderer/media/user_media_client_impl.h
@@ -21,6 +21,7 @@
#include "content/renderer/media/media_stream_source.h"
#include "third_party/WebKit/public/platform/WebMediaStream.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
+#include "third_party/WebKit/public/platform/WebSourceInfo.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/WebKit/public/web/WebMediaDevicesRequest.h"
#include "third_party/WebKit/public/web/WebUserMediaClient.h"
@@ -64,6 +65,8 @@ class CONTENT_EXPORT UserMediaClientImpl
const blink::WebMediaDevicesRequest& media_devices_request) OVERRIDE;
virtual void cancelMediaDevicesRequest(
const blink::WebMediaDevicesRequest& media_devices_request) OVERRIDE;
+ virtual void requestSources(
+ const blink::WebMediaStreamTrackSourcesRequest& sources_request) OVERRIDE;
// MediaStreamDispatcherEventHandler implementation.
virtual void OnStreamGenerated(
@@ -108,6 +111,9 @@ class CONTENT_EXPORT UserMediaClientImpl
virtual void EnumerateDevicesSucceded(
blink::WebMediaDevicesRequest* request,
blink::WebVector<blink::WebMediaDeviceInfo>& devices);
+ virtual void EnumerateSourcesSucceded(
+ blink::WebMediaStreamTrackSourcesRequest* request,
+ blink::WebVector<blink::WebSourceInfo>& sources);
// Creates a MediaStreamVideoSource object.
// This is virtual for test purposes.
virtual MediaStreamVideoSource* CreateVideoSource(
@@ -205,6 +211,9 @@ class CONTENT_EXPORT UserMediaClientImpl
const StreamDeviceInfoArray& audio_array,
const StreamDeviceInfoArray& video_array);
+ void FinalizeEnumerateDevices(MediaDevicesRequestInfo* request);
+ void FinalizeEnumerateSources(MediaDevicesRequestInfo* request);
+
UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id);
UserMediaRequestInfo* FindUserMediaRequestInfo(
const blink::WebUserMediaRequest& request);
« no previous file with comments | « content/renderer/media/mock_media_stream_dispatcher.cc ('k') | content/renderer/media/user_media_client_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698