Index: content/renderer/media/media_stream_impl.h |
diff --git a/content/renderer/media/media_stream_impl.h b/content/renderer/media/media_stream_impl.h |
index 0effc2a9074863c3dc6764625a4d2839a3332a31..87fedd70e74a05b9b57b54303d6a77629ef9acf2 100644 |
--- a/content/renderer/media/media_stream_impl.h |
+++ b/content/renderer/media/media_stream_impl.h |
@@ -146,7 +146,7 @@ class CONTENT_EXPORT MediaStreamImpl |
bool IsSourceUsed(const blink::WebMediaStreamSource& source) const; |
void RemoveSource(const blink::WebMediaStreamSource& source); |
- bool AreAllSourcesRemoved() const { return sources_.empty(); } |
+ bool HasPendingSources() const; |
private: |
void OnTrackStarted(MediaStreamSource* source, bool success); |
@@ -191,10 +191,15 @@ class CONTENT_EXPORT MediaStreamImpl |
UserMediaRequestInfo* request, |
content::MediaStreamRequestResult result); |
+ void OnStreamGeneratedForCancelledRequest( |
vrk (LEFT CHROMIUM)
2014/08/06 17:28:36
nit: Can you comment on what these arguments are?
andresp-chromium
2014/08/06 18:00:22
Nope. They are also not documented for OnStreamGen
|
+ const StreamDeviceInfoArray& audio_array, |
+ const StreamDeviceInfoArray& video_array); |
+ |
UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id); |
UserMediaRequestInfo* FindUserMediaRequestInfo( |
const blink::WebUserMediaRequest& request); |
void DeleteUserMediaRequestInfo(UserMediaRequestInfo* request); |
+ void DeleteAllUserMediaRequests(); |
MediaDevicesRequestInfo* FindMediaDevicesRequestInfo(int request_id); |
MediaDevicesRequestInfo* FindMediaDevicesRequestInfo( |