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

Unified Diff: ppapi/thunk/ppb_flash_thunk.cc

Issue 11413200: Refactored PPB_Flash GetSettings to the new pepper resource model (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
Index: ppapi/thunk/ppb_flash_thunk.cc
diff --git a/ppapi/thunk/ppb_flash_thunk.cc b/ppapi/thunk/ppb_flash_thunk.cc
index 9aac0ac9dbabd7b12596f0b06eca70f0104f0eff..732e7464b63967cdc2fc946c8d50cd086663d363 100644
--- a/ppapi/thunk/ppb_flash_thunk.cc
+++ b/ppapi/thunk/ppb_flash_thunk.cc
@@ -61,7 +61,7 @@ int32_t Navigate(PP_Resource request_id,
// To work around this, use the PP_Instance from the resource.
PP_Instance instance;
{
- thunk::EnterResource<thunk::PPB_URLRequestInfo_API> enter(request_id, true);
+ EnterResource<PPB_URLRequestInfo_API> enter(request_id, true);
if (enter.failed())
return PP_ERROR_BADRESOURCE;
instance = enter.resource()->pp_instance();
@@ -138,10 +138,10 @@ int32_t GetSettingInt(PP_Instance instance, PP_FlashSetting setting) {
}
PP_Var GetSetting(PP_Instance instance, PP_FlashSetting setting) {
- EnterInstance enter(instance);
+ EnterInstanceAPI<PPB_Flash_Functions_API> enter(instance);
if (enter.failed())
return PP_MakeUndefined();
- return enter.functions()->GetFlashAPI()->GetSetting(instance, setting);
+ return enter.functions()->GetSetting(instance, setting);
}
PP_Bool SetCrashData(PP_Instance instance,
@@ -156,7 +156,7 @@ PP_Bool SetCrashData(PP_Instance instance,
int32_t EnumerateVideoCaptureDevices(PP_Instance instance,
PP_Resource video_capture,
PP_ArrayOutput devices) {
- thunk::EnterResource<thunk::PPB_VideoCapture_API> enter(video_capture, true);
+ EnterResource<PPB_VideoCapture_API> enter(video_capture, true);
if (enter.failed())
return enter.retval();
return enter.object()->EnumerateDevicesSync(devices);

Powered by Google App Engine
This is Rietveld 408576698