content/renderer/pepper/pepper_device_enumeration_event_handler.cc - Issue 11411047: Introduce PPB_AudioInput_Dev v0.3 and refactor the device enumeration code:

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 11411047: Introduce PPB_AudioInput_Dev v0.3 and refactor the device enumeration code: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: . Created 8 years 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 | « content/renderer/pepper/pepper_device_enumeration_event_handler.h ('k') | content/renderer/pepper/pepper_device_enumeration_host_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_device_enumeration_event_handler.cc

diff --git a/content/renderer/pepper/pepper_device_enumeration_event_handler.cc b/content/renderer/pepper/pepper_device_enumeration_event_handler.cc

index ff58e2dd821a5407f61c19221f707129667f401b..42634df261d51c3e15f9d727d91f30cd4c02459d 100644

--- a/content/renderer/pepper/pepper_device_enumeration_event_handler.cc

+++ b/content/renderer/pepper/pepper_device_enumeration_event_handler.cc

@@ -37,6 +37,11 @@ int PepperDeviceEnumerationEventHandler::RegisterEnumerateDevicesCallback(

return next_id_++;

}

+void PepperDeviceEnumerationEventHandler::UnregisterEnumerateDevicesCallback(

+ int request_id) {

+ enumerate_callbacks_.erase(request_id);

int PepperDeviceEnumerationEventHandler::RegisterOpenDeviceCallback(

const PepperPluginDelegateImpl::OpenDeviceCallback& callback) {

open_callbacks_[next_id_] = callback;

@@ -121,7 +126,6 @@ void PepperDeviceEnumerationEventHandler::NotifyDevicesEnumerated(

webkit::ppapi::PluginDelegate::EnumerateDevicesCallback callback =

iter->second;

- enumerate_callbacks_.erase(iter);

std::vector<ppapi::DeviceRefData> devices;

if (succeeded) {