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

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: Remove common.h 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
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..79f4b7e5b937bfe8e2c6cc9aa94f6b47bd2959fd 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"
@@ -33,9 +32,8 @@ int32_t GetNextEntry(PP_Resource directory_reader,
PP_CompletionCallback callback) {
EnterResource<PPB_DirectoryReader_API> enter(directory_reader, true);
yzshen1 2012/01/25 19:11:01 Yeah, find one! :)
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 = {

Powered by Google App Engine
This is Rietveld 408576698