From 1ee45dac96cbad1b531061beeb4d05d8b74532a6 Mon Sep 17 00:00:00 2001 From: "perkj@chromium.org" Date: Thu, 14 Nov 2013 14:44:22 +0000 Subject: Fix cancelling of device enumeration requests. TEST= Log using --vmodule=media_stream_manager*=3,media_stream_dispatcher*=3 and make sure the log print out media_stream_manager.cc(316)]CancelRequest( after MediaStreamDispatcher::StopEnumerateDevices() while using the webcam on youtube.com/my_webcam?privacy=public BUG=317534 R=xians@chromium.org Review URL: https://codereview.chromium.org/72683002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235139 0039d316-1c4b-4281-b951-d872f2087c98 --- content/browser/renderer_host/media/media_stream_dispatcher_host.cc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'content') diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc index e235d80..0988d3b 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc @@ -95,6 +95,8 @@ bool MediaStreamDispatcherHost::OnMessageReceived( OnStopStreamDevice) IPC_MESSAGE_HANDLER(MediaStreamHostMsg_EnumerateDevices, OnEnumerateDevices) + IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CancelEnumerateDevices, + OnCancelEnumerateDevices); IPC_MESSAGE_HANDLER(MediaStreamHostMsg_OpenDevice, OnOpenDevice) IPC_MESSAGE_HANDLER(MediaStreamHostMsg_CloseDevice, -- cgit v1.1