diff options
| author | dharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 22:27:44 +0000 |
|---|---|---|
| committer | dharani@google.com <dharani@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-18 22:27:44 +0000 |
| commit | 18074095f679b4f40d1dc3d622e5388ff61f0a77 (patch) | |
| tree | 00895eee0f795d98cf795a22ad2b437d23a1c4f3 | |
| parent | c6a7fa835c91fc8b602362f7d3017f6871ab0a5f (diff) | |
| download | chromium_src-18074095f679b4f40d1dc3d622e5388ff61f0a77.zip chromium_src-18074095f679b4f40d1dc3d622e5388ff61f0a77.tar.gz chromium_src-18074095f679b4f40d1dc3d622e5388ff61f0a77.tar.bz2 | |
Revert 235139 "Fix cancelling of device enumeration requests."
Its a revert only on the 1712 branch.
> 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
TBR=perkj@chromium.org
Review URL: https://codereview.chromium.org/75483007
git-svn-id: svn://svn.chromium.org/chrome/branches/1712/src@235831 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/renderer_host/media/media_stream_dispatcher_host.cc | 2 |
1 files changed, 0 insertions, 2 deletions
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 0988d3b..e235d80 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc @@ -95,8 +95,6 @@ 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, |