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

Unified Diff: content/renderer/pepper/pepper_plugin_delegate_impl.cc

Issue 10837064: Corresponding change in Pepper since EnumerateDevices contract is changed. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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_plugin_delegate_impl.cc
===================================================================
--- content/renderer/pepper/pepper_plugin_delegate_impl.cc (revision 148913)
+++ content/renderer/pepper/pepper_plugin_delegate_impl.cc (working copy)
@@ -1495,6 +1495,24 @@
return request_id;
}
+int PepperPluginDelegateImpl::StopEnumerateDevices(int request_id) {
+ device_enumeration_event_handler_->UnregisterEnumerateDevicesCallback(
+ request_id);
+
+#if defined(ENABLE_WEBRTC)
+ render_view_->media_stream_dispatcher()->StopEnumerateDevices(
+ request_id, device_enumeration_event_handler_.get()->AsWeakPtr());
+#else
+ MessageLoop::current()->PostTask(
+ FROM_HERE,
+ base::Bind(
+ &PepperDeviceEnumerationEventHandler::OnDevicesEnumerationFailed,
+ device_enumeration_event_handler_->AsWeakPtr(), request_id));
+#endif
+
+ return request_id;
+}
+
bool PepperPluginDelegateImpl::OnMessageReceived(const IPC::Message& message) {
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(PepperPluginDelegateImpl, message)

Powered by Google App Engine
This is Rietveld 408576698