Refactor the way singleton-style resources are exposed via PPB_Instance

Currently a lot of boilerplate needs to be added everytime we add a new singleton style resource and as we add more of them this will accumulate. This patch reduces the amount of code needed by exposing a GetSingletonResource function in PPB_Instance_API which takes an ID specifying what type of resource is needed. A new Enter type, EnterInstanceAPI, is provided which is templated on the singleton API you want access to.

BUG=

Review URL: https://codereview.chromium.org/11359063

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170221 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 17 deletions

diff --git a/ppapi/thunk/ppb_flash_clipboard_api.h b/ppapi/thunk/ppb_flash_clipboard_api.h
index ef022c4a..4be9aee 100644
--- a/ppapi/thunk/ppb_flash_clipboard_api.h
+++ b/ppapi/thunk/ppb_flash_clipboard_api.h
@@ -6,6 +6,7 @@
 #define PPAPI_THUNK_PPB_FLASH_CLIPBOARD_API_H_
 
 #include "ppapi/c/private/ppb_flash_clipboard.h"
+#include "ppapi/shared_impl/singleton_resource_id.h"
 
 namespace ppapi {
 namespace thunk {
@@ -15,23 +16,22 @@ class PPB_Flash_Clipboard_API {
   virtual ~PPB_Flash_Clipboard_API() {}
 
   // PPB_Flash_Clipboard.
-  virtual uint32_t RegisterCustomFormat(
-    PP_Instance instance,
-    const char* format_name) = 0;
-  virtual PP_Bool IsFormatAvailable(
-    PP_Instance instance,
-    PP_Flash_Clipboard_Type clipboard_type,
-    uint32_t format) = 0;
-  virtual PP_Var ReadData(
-    PP_Instance instance,
-    PP_Flash_Clipboard_Type clipboard_type,
-    uint32_t format) = 0;
-  virtual int32_t WriteData(
-    PP_Instance instance,
-    PP_Flash_Clipboard_Type clipboard_type,
-    uint32_t data_item_count,
-    const uint32_t formats[],
-    const PP_Var data_items[]) = 0;
+  virtual uint32_t RegisterCustomFormat(PP_Instance instance,
+                                        const char* format_name) = 0;
+  virtual PP_Bool IsFormatAvailable(PP_Instance instance,
+                                    PP_Flash_Clipboard_Type clipboard_type,
+                                    uint32_t format) = 0;
+  virtual PP_Var ReadData(PP_Instance instance,
+                          PP_Flash_Clipboard_Type clipboard_type,
+                          uint32_t format) = 0;
+  virtual int32_t WriteData(PP_Instance instance,
+                            PP_Flash_Clipboard_Type clipboard_type,
+                            uint32_t data_item_count,
+                            const uint32_t formats[],
+                            const PP_Var data_items[]) = 0;
+
+  static const SingletonResourceID kSingletonResourceID =
+      FLASH_CLIPBOARD_SINGLETON_ID;
 };
 
 }  // namespace thunk