| Index: content/browser/renderer_host/media/media_stream_manager.cc
|
| diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
|
| index 12d5f829508bf1dcaa2e99ea465072b5f25af035..bfa64516d007503593d6415e304bb29e34f4dbb5 100644
|
| --- a/content/browser/renderer_host/media/media_stream_manager.cc
|
| +++ b/content/browser/renderer_host/media/media_stream_manager.cc
|
| @@ -1338,6 +1338,7 @@ void MediaStreamManager::HandleRequestDone(const std::string& label,
|
| switch (request->request_type) {
|
| case MEDIA_OPEN_DEVICE_PEPPER_ONLY:
|
| FinalizeOpenDevice(label, request);
|
| + OnStreamStarted(label);
|
| break;
|
| case MEDIA_GENERATE_STREAM: {
|
| FinalizeGenerateStream(label, request);
|
| @@ -1347,17 +1348,6 @@ void MediaStreamManager::HandleRequestDone(const std::string& label,
|
| NOTREACHED();
|
| break;
|
| }
|
| -
|
| - if (request->ui_proxy.get()) {
|
| - request->ui_proxy->OnStarted(
|
| - base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser,
|
| - base::Unretained(this),
|
| - label),
|
| - base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId,
|
| - base::Unretained(this),
|
| - request->video_type(),
|
| - request->devices));
|
| - }
|
| }
|
|
|
| void MediaStreamManager::Closed(MediaStreamType stream_type,
|
| @@ -1774,4 +1764,19 @@ MediaStreamDevices MediaStreamManager::ConvertToMediaStreamDevices(
|
| return devices;
|
| }
|
|
|
| +void MediaStreamManager::OnStreamStarted(const std::string& label) {
|
| + DeviceRequest* const request = FindRequest(label);
|
| + if (!request)
|
| + return;
|
| +
|
| + if (request->ui_proxy) {
|
| + request->ui_proxy->OnStarted(
|
| + base::Bind(&MediaStreamManager::StopMediaStreamFromBrowser,
|
| + base::Unretained(this), label),
|
| + base::Bind(&MediaStreamManager::OnMediaStreamUIWindowId,
|
| + base::Unretained(this), request->video_type(),
|
| + request->devices));
|
| + }
|
| +}
|
| +
|
| } // namespace content
|
|
|