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

Unified Diff: content/renderer/pepper/pepper_device_enumeration_event_handler.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
Index: content/renderer/pepper/pepper_device_enumeration_event_handler.cc
===================================================================
--- content/renderer/pepper/pepper_device_enumeration_event_handler.cc (revision 150440)
+++ content/renderer/pepper/pepper_device_enumeration_event_handler.cc (working copy)
@@ -127,7 +127,8 @@
const media_stream::StreamDeviceInfoArray& device_array) {
EnumerateCallbackMap::iterator iter = enumerate_callbacks_.find(request_id);
if (iter == enumerate_callbacks_.end()) {
- NOTREACHED();
+ // This might be enumerated result sent before StopEnumerateDevices is
+ // called since EnumerateDevices is persistent request.
return;
}
« no previous file with comments | « content/renderer/media/media_stream_dispatcher_unittest.cc ('k') | content/renderer/pepper/pepper_plugin_delegate_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698