Chromium Code Reviews| Index: ppapi/shared_impl/ppb_audio_input_shared.cc |
| =================================================================== |
| --- ppapi/shared_impl/ppb_audio_input_shared.cc (revision 148913) |
| +++ ppapi/shared_impl/ppb_audio_input_shared.cc (working copy) |
| @@ -62,6 +62,12 @@ |
| return InternalEnumerateDevices(devices, callback); |
| } |
| +int32_t PPB_AudioInput_Shared::StopEnumerateDevices(PP_Resource* devices) { |
| + devices_ = NULL; |
| + enumerate_devices_callback_ = NULL; |
| + return InternalStopEnumerateDevices(devices); |
| +} |
| + |
| int32_t PPB_AudioInput_Shared::Open( |
| const std::string& device_id, |
| PP_Resource config, |
| @@ -138,9 +144,8 @@ |
| *devices_ = PPB_DeviceRef_Shared::CreateResourceArray( |
| resource_object_type_, pp_instance(), devices); |
| } |
| - devices_ = NULL; |
| - TrackedCallback::ClearAndRun(&enumerate_devices_callback_, result); |
| + enumerate_devices_callback_->Run(result); |
|
viettrungluu
2012/08/02 02:36:14
You can't use a completion callback any more. Comp
|
| } |
| void PPB_AudioInput_Shared::OnOpenComplete( |