Chromium Code Reviews| 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 ad960201f361df85e1c55c96ba6b3241288ae89e..195145f0128605ffd19b325d86e08468d5a10f14 100644 |
| --- a/content/renderer/media/media_stream_impl.h |
| +++ b/content/renderer/media/media_stream_impl.h |
| @@ -98,7 +98,8 @@ class CONTENT_EXPORT MediaStreamImpl |
| blink::WebUserMediaRequest* request_info); |
| virtual void GetUserMediaRequestFailed( |
| blink::WebUserMediaRequest* request_info, |
| - content::MediaStreamRequestResult result); |
| + content::MediaStreamRequestResult result, |
| + const blink::WebString& result_name = blink::WebString()); |
|
no longer working on chromium
2014/07/25 19:27:35
I don't understand why you need a result_name stri
jiajia.qin
2014/07/28 04:46:52
The spec says if it is a constraint failure. Let e
|
| virtual void EnumerateDevicesSucceded( |
| blink::WebMediaDevicesRequest* request, |
| blink::WebVector<blink::WebMediaDeviceInfo>& devices); |
| @@ -115,7 +116,8 @@ class CONTENT_EXPORT MediaStreamImpl |
| : public base::SupportsWeakPtr<UserMediaRequestInfo> { |
| public: |
| typedef base::Callback<void(UserMediaRequestInfo* request_info, |
| - content::MediaStreamRequestResult result)> |
| + content::MediaStreamRequestResult result, |
| + const blink::WebString& result_name)> |
| ResourcesReady; |
| UserMediaRequestInfo(int request_id, |
| @@ -149,7 +151,10 @@ class CONTENT_EXPORT MediaStreamImpl |
| bool AreAllSourcesRemoved() const { return sources_.empty(); } |
| private: |
| - void OnTrackStarted(MediaStreamSource* source, bool success); |
| + void OnTrackStarted( |
|
no longer working on chromium
2014/07/28 19:55:08
Avoid using default param.
If OnTrackStarted is u
jiajia.qin
2014/07/30 05:18:07
I have made a overload for GetUserMediaRequestFail
|
| + MediaStreamSource* source, |
| + content::MediaStreamRequestResult result, |
| + const blink::WebString& result_name = blink::WebString()); |
| void CheckAllTracksStarted(); |
| ResourcesReady ready_callback_; |
| @@ -200,7 +205,8 @@ class CONTENT_EXPORT MediaStreamImpl |
| // underlying media sources and tracks have been created and started. |
| void OnCreateNativeTracksCompleted( |
| UserMediaRequestInfo* request, |
| - content::MediaStreamRequestResult result); |
| + content::MediaStreamRequestResult result, |
| + const blink::WebString& result_name = blink::WebString()); |
| UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id); |
| UserMediaRequestInfo* FindUserMediaRequestInfo( |