Index: ppapi/proxy/resource_creation_proxy.h |
diff --git a/ppapi/proxy/resource_creation_proxy.h b/ppapi/proxy/resource_creation_proxy.h |
index 0f1589b54574e7e0dbd63523af588696240986c3..1db9164a8da800f2a8d07bf3087e49185ad3b38c 100644 |
--- a/ppapi/proxy/resource_creation_proxy.h |
+++ b/ppapi/proxy/resource_creation_proxy.h |
@@ -11,8 +11,8 @@ |
#include "ipc/ipc_channel.h" |
#include "ppapi/c/pp_bool.h" |
#include "ppapi/c/pp_instance.h" |
+#include "ppapi/proxy/interface_proxy.h" |
#include "ppapi/proxy/serialized_structs.h" |
-#include "ppapi/shared_impl/function_group_base.h" |
#include "ppapi/thunk/resource_creation_api.h" |
struct PP_Size; |
@@ -25,14 +25,16 @@ namespace proxy { |
class Dispatcher; |
-class ResourceCreationProxy : public FunctionGroupBase, |
- public thunk::ResourceCreationAPI, |
- public IPC::Channel::Listener, |
- public IPC::Message::Sender { |
+class ResourceCreationProxy : public InterfaceProxy, |
+ public thunk::ResourceCreationAPI { |
public: |
explicit ResourceCreationProxy(Dispatcher* dispatcher); |
virtual ~ResourceCreationProxy(); |
+ // Factory function used for registration (normal code can just use the |
+ // constructor). |
+ static InterfaceProxy* Create(Dispatcher* dispatcher); |
+ |
virtual thunk::ResourceCreationAPI* AsResourceCreationAPI() OVERRIDE; |
// ResourceCreationAPI (called in plugin). |
@@ -149,8 +151,6 @@ class ResourceCreationProxy : public FunctionGroupBase, |
std::string* image_data_desc, |
ImageHandle* result_image_handle); |
- Dispatcher* dispatcher_; |
- |
DISALLOW_COPY_AND_ASSIGN(ResourceCreationProxy); |
}; |