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

Unified Diff: ppapi/thunk/ppb_directory_reader_thunk.cc

Issue 9113044: Convert to new enter method (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: PATCH DESCRIPTIONS ARE A STUPID WASTE OF TIME Created 8 years, 11 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/thunk/ppb_buffer_trusted_thunk.cc ('k') | ppapi/thunk/ppb_file_chooser_thunk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ppapi/thunk/ppb_directory_reader_thunk.cc
diff --git a/ppapi/thunk/ppb_directory_reader_thunk.cc b/ppapi/thunk/ppb_directory_reader_thunk.cc
index f03b165227d13efdd970521c3853cb5d4e580e1d..369283ccc10511026b92a4599bb54df16a2f2ea9 100644
--- a/ppapi/thunk/ppb_directory_reader_thunk.cc
+++ b/ppapi/thunk/ppb_directory_reader_thunk.cc
@@ -5,7 +5,6 @@
#include "ppapi/c/dev/ppb_directory_reader_dev.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_directory_reader_api.h"
@@ -31,11 +30,11 @@ PP_Bool IsDirectoryReader(PP_Resource resource) {
int32_t GetNextEntry(PP_Resource directory_reader,
PP_DirectoryEntry_Dev* entry,
PP_CompletionCallback callback) {
- EnterResource<PPB_DirectoryReader_API> enter(directory_reader, true);
+ EnterResource<PPB_DirectoryReader_API> enter(
+ directory_reader, callback, true);
if (enter.failed())
- return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
- int32_t result = enter.object()->GetNextEntry(entry, callback);
- return MayForceCallback(callback, result);
+ return enter.retval();
+ return enter.SetResult(enter.object()->GetNextEntry(entry, callback));
}
const PPB_DirectoryReader_Dev g_ppb_directory_reader_thunk = {
« no previous file with comments | « ppapi/thunk/ppb_buffer_trusted_thunk.cc ('k') | ppapi/thunk/ppb_file_chooser_thunk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698