| 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 83a247bdd9e9e7bfa6f5d6f21151d4872b7fd3b9..5f33c98fba5957abd480f290b115a8d41c8cdd43 100644
|
| --- a/content/renderer/media/user_media_client_impl.h
|
| +++ b/content/renderer/media/user_media_client_impl.h
|
| @@ -24,6 +24,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 @@
|
| 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 @@
|
| 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 @@
|
| using EnumerationResult = std::vector<std::vector<MediaDeviceInfo>>;
|
| void FinalizeEnumerateDevices(blink::WebMediaDevicesRequest request,
|
| const EnumerationResult& result);
|
| + void FinalizeGetSources(blink::WebMediaStreamTrackSourcesRequest request,
|
| + const EnumerationResult& result);
|
|
|
| void DeleteAllUserMediaRequests();
|
|
|
|
|