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

Unified Diff: ppapi/shared_impl/ppb_audio_input_shared.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
« no previous file with comments | « ppapi/shared_impl/ppb_audio_input_shared.h ('k') | ppapi/shared_impl/ppb_video_capture_shared.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « ppapi/shared_impl/ppb_audio_input_shared.h ('k') | ppapi/shared_impl/ppb_video_capture_shared.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698