Index: ppapi/thunk/ppb_flash_menu_thunk.cc |
diff --git a/ppapi/thunk/ppb_flash_menu_thunk.cc b/ppapi/thunk/ppb_flash_menu_thunk.cc |
index 9426aa9a5f2255979912e4049dbe736466f6c299..db742391fb33be03eb0d40a5330a910cd3d7e2ee 100644 |
--- a/ppapi/thunk/ppb_flash_menu_thunk.cc |
+++ b/ppapi/thunk/ppb_flash_menu_thunk.cc |
@@ -5,7 +5,6 @@ |
#include "ppapi/c/private/ppb_flash_menu.h" |
#include "ppapi/c/pp_completion_callback.h" |
#include "ppapi/c/pp_errors.h" |
-#include "ppapi/thunk/common.h" |
#include "ppapi/thunk/enter.h" |
#include "ppapi/thunk/thunk.h" |
#include "ppapi/thunk/ppb_flash_menu_api.h" |
@@ -32,11 +31,10 @@ int32_t Show(PP_Resource resource, |
const PP_Point* location, |
int32_t* selected_id, |
PP_CompletionCallback callback) { |
- EnterResource<PPB_Flash_Menu_API> enter(resource, true); |
+ EnterResource<PPB_Flash_Menu_API> enter(resource, callback, true); |
if (enter.failed()) |
- return MayForceCallback(callback, PP_ERROR_BADRESOURCE); |
- int32_t result = enter.object()->Show(location, selected_id, callback); |
- return MayForceCallback(callback, result); |
+ return enter.retval(); |
+ return enter.SetResult(enter.object()->Show(location, selected_id, callback)); |
} |
const PPB_Flash_Menu g_ppb_flash_menu_thunk = { |