| 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..dda1cbd562d3d26394afb72904994338d9b9ab3f 100644
|
| --- a/content/renderer/media/media_stream_impl.h
|
| +++ b/content/renderer/media/media_stream_impl.h
|
| @@ -73,7 +73,7 @@ class CONTENT_EXPORT MediaStreamImpl
|
| const StreamDeviceInfoArray& video_array) OVERRIDE;
|
| virtual void OnStreamGenerationFailed(
|
| int request_id,
|
| - content::MediaStreamRequestResult result) OVERRIDE;
|
| + MediaStreamRequestResult result) OVERRIDE;
|
| virtual void OnDeviceStopped(const std::string& label,
|
| const StreamDeviceInfo& device_info) OVERRIDE;
|
| virtual void OnDevicesEnumerated(
|
| @@ -100,7 +100,11 @@ class CONTENT_EXPORT MediaStreamImpl
|
| blink::WebUserMediaRequest* request_info);
|
| virtual void GetUserMediaRequestFailed(
|
| blink::WebUserMediaRequest* request_info,
|
| - content::MediaStreamRequestResult result);
|
| + MediaStreamRequestResult result);
|
| + virtual void GetUserMediaRequestFailed(
|
| + blink::WebUserMediaRequest* request_info,
|
| + MediaStreamRequestResult result,
|
| + const blink::WebString& result_name);
|
| virtual void EnumerateDevicesSucceded(
|
| blink::WebMediaDevicesRequest* request,
|
| blink::WebVector<blink::WebMediaDeviceInfo>& devices);
|
| @@ -117,7 +121,8 @@ class CONTENT_EXPORT MediaStreamImpl
|
| : public base::SupportsWeakPtr<UserMediaRequestInfo> {
|
| public:
|
| typedef base::Callback<void(UserMediaRequestInfo* request_info,
|
| - content::MediaStreamRequestResult result)>
|
| + MediaStreamRequestResult result,
|
| + const blink::WebString& result_name)>
|
| ResourcesReady;
|
|
|
| UserMediaRequestInfo(int request_id,
|
| @@ -149,7 +154,10 @@ class CONTENT_EXPORT MediaStreamImpl
|
| bool AreAllSourcesRemoved() const { return sources_.empty(); }
|
|
|
| private:
|
| - void OnTrackStarted(MediaStreamSource* source, bool success);
|
| + void OnTrackStarted(
|
| + MediaStreamSource* source,
|
| + MediaStreamRequestResult result,
|
| + const blink::WebString& result_name);
|
| void CheckAllTracksStarted();
|
|
|
| ResourcesReady ready_callback_;
|
| @@ -189,7 +197,8 @@ class CONTENT_EXPORT MediaStreamImpl
|
| // underlying media sources and tracks have been created and started.
|
| void OnCreateNativeTracksCompleted(
|
| UserMediaRequestInfo* request,
|
| - content::MediaStreamRequestResult result);
|
| + MediaStreamRequestResult result,
|
| + const blink::WebString& result_name);
|
|
|
| UserMediaRequestInfo* FindUserMediaRequestInfo(int request_id);
|
| UserMediaRequestInfo* FindUserMediaRequestInfo(
|
|
|