Index: ppapi/native_client/src/trusted/plugin/service_runtime.h |
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.h b/ppapi/native_client/src/trusted/plugin/service_runtime.h |
index 650aa3d59bcab17053ec45d56158d68fbd9e18f4..da3fb07df1acbc1923239aa060658715424a646e 100644 |
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.h |
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.h |
@@ -34,7 +34,6 @@ class DescWrapper; |
namespace plugin { |
-class OpenManifestEntryAsyncCallback; |
class Plugin; |
class SrpcClient; |
class ServiceRuntime; |
@@ -72,20 +71,16 @@ struct OpenManifestEntryResource { |
public: |
OpenManifestEntryResource(const std::string& target_url, |
struct NaClFileInfo* finfo, |
- bool* op_complete, |
- OpenManifestEntryAsyncCallback* callback) |
+ bool* op_complete) |
: url(target_url), |
file_info(finfo), |
- op_complete_ptr(op_complete), |
- callback(callback) {} |
+ op_complete_ptr(op_complete) {} |
~OpenManifestEntryResource(); |
- void MaybeRunCallback(int32_t pp_error); |
std::string url; |
struct NaClFileInfo* file_info; |
PP_NaClFileInfo pp_file_info; |
bool* op_complete_ptr; |
- OpenManifestEntryAsyncCallback* callback; |
}; |
// Do not invoke from the main thread, since the main methods will |
@@ -125,15 +120,6 @@ class PluginReverseInterface: public nacl::ReverseInterface { |
int64_t offset, |
int64_t bytes_to_write); |
- // This is a sibling of OpenManifestEntry. While OpenManifestEntry is |
- // a sync function and must be called on a non-main thread, |
- // OpenManifestEntryAsync must be called on the main thread. Upon completion |
- // (even on error), callback will be invoked. The caller has responsibility |
- // to keep the memory passed to info until callback is invoked. |
- void OpenManifestEntryAsync(const nacl::string& key, |
- struct NaClFileInfo* info, |
- OpenManifestEntryAsyncCallback* callback); |
- |
protected: |
virtual void OpenManifestEntry_MainThreadContinuation( |
OpenManifestEntryResource* p, |