Chromium Code Reviews| Index: content/browser/renderer_host/media/media_stream_ui_proxy.cc |
| diff --git a/content/browser/renderer_host/media/media_stream_ui_proxy.cc b/content/browser/renderer_host/media/media_stream_ui_proxy.cc |
| index b91ccb12095d293374e743d74f8bdfabb7c2f9f8..4d0788e8ba2050f5fb01dea2645841e2378f2052 100644 |
| --- a/content/browser/renderer_host/media/media_stream_ui_proxy.cc |
| +++ b/content/browser/renderer_host/media/media_stream_ui_proxy.cc |
| @@ -22,6 +22,7 @@ class MediaStreamUIProxy::Core { |
| private: |
| void ProcessAccessRequestResponse(const MediaStreamDevices& devices, |
| + content::MediaStreamRequestResult result, |
| scoped_ptr<MediaStreamUI> stream_ui); |
| void ProcessStopRequestFromUI(); |
| @@ -63,7 +64,9 @@ void MediaStreamUIProxy::Core::RequestAccess( |
| // Tab may have gone away. |
| if (!host || !host->GetDelegate()) { |
| ProcessAccessRequestResponse( |
| - MediaStreamDevices(), scoped_ptr<MediaStreamUI>()); |
| + MediaStreamDevices(), |
| + MEDIA_DEVICE_INVALID_STATE, |
| + scoped_ptr<MediaStreamUI>()); |
| return; |
| } |
| @@ -85,6 +88,7 @@ void MediaStreamUIProxy::Core::OnStarted() { |
| void MediaStreamUIProxy::Core::ProcessAccessRequestResponse( |
| const MediaStreamDevices& devices, |
| + content::MediaStreamRequestResult result, |
| scoped_ptr<MediaStreamUI> stream_ui) { |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| @@ -92,7 +96,7 @@ void MediaStreamUIProxy::Core::ProcessAccessRequestResponse( |
| BrowserThread::PostTask( |
| BrowserThread::IO, FROM_HERE, |
| base::Bind(&MediaStreamUIProxy::ProcessAccessRequestResponse, |
| - proxy_, devices)); |
| + proxy_, devices, result)); |
| } |
| void MediaStreamUIProxy::Core::ProcessStopRequestFromUI() { |
| @@ -148,13 +152,14 @@ void MediaStreamUIProxy::OnStarted(const base::Closure& stop_callback) { |
| } |
| void MediaStreamUIProxy::ProcessAccessRequestResponse( |
| - const MediaStreamDevices& devices) { |
| + const MediaStreamDevices& devices, |
| + content::MediaStreamRequestResult result) { |
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| DCHECK(!response_callback_.is_null()); |
| ResponseCallback cb = response_callback_; |
| response_callback_.Reset(); |
| - cb.Run(devices); |
| + cb.Run(devices, result); |
| } |
| void MediaStreamUIProxy::ProcessStopRequestFromUI() { |
| @@ -211,7 +216,11 @@ void FakeMediaStreamUIProxy::RequestAccess( |
| BrowserThread::PostTask( |
| BrowserThread::IO, FROM_HERE, |
| base::Bind(&MediaStreamUIProxy::ProcessAccessRequestResponse, |
| - weak_factory_.GetWeakPtr(), devices_to_use)); |
| + weak_factory_.GetWeakPtr(), |
| + devices_to_use, |
| + devices_to_use.empty() ? |
| + MEDIA_DEVICE_NO_HARDWARE : |
|
perkj_chrome
2014/03/07 12:46:22
4-space indentation
Tommy Widenflycht
2014/03/07 14:37:09
Done.
|
| + MEDIA_DEVICE_OK)); |
| } |
| void FakeMediaStreamUIProxy::OnStarted(const base::Closure& stop_callback) { |