Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1698)

Unified Diff: content/browser/renderer_host/media/media_stream_manager.cc

Issue 2721113002: getUserMedia: handle the device starting status report. (Closed)
Patch Set: address nits Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698