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

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

Issue 2489823002: Revert "Remove MediaStreamTrack.getSources()." (Closed)
Patch Set: rebase Created 4 years, 1 month 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
« no previous file with comments | « content/renderer/media/media_stream_center.cc ('k') | content/renderer/media/user_media_client_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 6931e7b69589e295f47011aeb0f425123e26832c..6199c9e98c7242f9b6cfb361c02d58d71617510a 100644
--- a/content/renderer/media/user_media_client_impl.h
+++ b/content/renderer/media/user_media_client_impl.h
@@ -25,6 +25,7 @@
#include "services/service_manager/public/cpp/interface_provider.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/WebMediaDeviceChangeObserver.h"
#include "third_party/WebKit/public/web/WebMediaDevicesRequest.h"
@@ -66,6 +67,8 @@ class CONTENT_EXPORT UserMediaClientImpl
const blink::WebUserMediaRequest& user_media_request) override;
void requestMediaDevices(
const blink::WebMediaDevicesRequest& media_devices_request) override;
+ void requestSources(
+ const blink::WebMediaStreamTrackSourcesRequest& sources_request) override;
void setMediaDeviceChangeObserver(
const blink::WebMediaDeviceChangeObserver& observer) override;
@@ -117,6 +120,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 MediaStreamAudioSource/MediaStreamVideoSource objects.
// These are virtual for test purposes.
@@ -228,6 +234,8 @@ class CONTENT_EXPORT UserMediaClientImpl
using EnumerationResult = std::vector<MediaDeviceInfoArray>;
void FinalizeEnumerateDevices(blink::WebMediaDevicesRequest request,
const EnumerationResult& result);
+ void FinalizeGetSources(blink::WebMediaStreamTrackSourcesRequest request,
+ const EnumerationResult& result);
void DeleteAllUserMediaRequests();
« no previous file with comments | « content/renderer/media/media_stream_center.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