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

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

Issue 10830063: refactor EnumerateDevices to make it a persistent request. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix unit test Created 8 years, 4 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
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/media_stream_dispatcher_host.cc
===================================================================
--- content/browser/renderer_host/media/media_stream_dispatcher_host.cc (revision 150440)
+++ content/browser/renderer_host/media/media_stream_dispatcher_host.cc (working copy)
@@ -100,10 +100,9 @@
StreamMap::iterator it = streams_.find(label);
DCHECK(it != streams_.end());
StreamRequest request = it->second;
- streams_.erase(it);
Send(new MediaStreamMsg_DevicesEnumerated(
- request.render_view_id, request.page_request_id, devices));
+ request.render_view_id, request.page_request_id, label, devices));
}
void MediaStreamDispatcherHost::DeviceOpened(
@@ -196,7 +195,6 @@
<< ", {label = " << label << "})";
StreamMap::iterator it = streams_.find(label);
- DCHECK(it != streams_.end());
GetManager()->StopGeneratedStream(label);
streams_.erase(it);
}
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698