summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/plugin_globals.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-29 20:16:50 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-29 20:16:50 +0000
commitbbc4912ddf6663cf88a469a2f271786829a273db (patch)
tree63fc2e6e9506c29c42a9ca8a10c87a4172746305 /ppapi/proxy/plugin_globals.h
parentd0b4d95e895bf5ac395c5f677c1fcab84229c3de (diff)
downloadchromium_src-bbc4912ddf6663cf88a469a2f271786829a273db.zip
chromium_src-bbc4912ddf6663cf88a469a2f271786829a273db.tar.gz
chromium_src-bbc4912ddf6663cf88a469a2f271786829a273db.tar.bz2
Move the tracked completion callback code into shared impl.
This keeps the original which is still used by all existing callers. The new one exists in parallel through the magic of namespaces. I'll convert the existing callers over in a subsequent pass. I split it out into separate files: tracked_callback and callback_tracker. I also merged the old TrackedCallback and TrackedCompletionCallback since we never have any callbascks that aren't completion callbacks. BUG=74062 Review URL: http://codereview.chromium.org/9006055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115982 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/plugin_globals.h')
-rw-r--r--ppapi/proxy/plugin_globals.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h
index a76b7f0..ffcf01e 100644
--- a/ppapi/proxy/plugin_globals.h
+++ b/ppapi/proxy/plugin_globals.h
@@ -9,6 +9,7 @@
#include "ppapi/proxy/plugin_resource_tracker.h"
#include "ppapi/proxy/plugin_var_tracker.h"
#include "ppapi/proxy/ppapi_proxy_export.h"
+#include "ppapi/shared_impl/callback_tracker.h"
#include "ppapi/shared_impl/ppapi_globals.h"
namespace ppapi {
@@ -29,6 +30,8 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals {
// PpapiGlobals implementation.
virtual ResourceTracker* GetResourceTracker() OVERRIDE;
virtual VarTracker* GetVarTracker() OVERRIDE;
+ virtual CallbackTracker* GetCallbackTrackerForInstance(
+ PP_Instance instance) OVERRIDE;
virtual FunctionGroupBase* GetFunctionAPI(PP_Instance inst,
ApiID id) OVERRIDE;
virtual PP_Module GetModuleForInstance(PP_Instance instance) OVERRIDE;
@@ -55,6 +58,7 @@ class PPAPI_PROXY_EXPORT PluginGlobals : public PpapiGlobals {
PluginProxyDelegate* plugin_proxy_delegate_;
PluginResourceTracker plugin_resource_tracker_;
PluginVarTracker plugin_var_tracker_;
+ scoped_refptr<CallbackTracker> callback_tracker_;
DISALLOW_COPY_AND_ASSIGN(PluginGlobals);
};