summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/plugin_resource_tracker.h
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 19:22:53 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 19:22:53 +0000
commit55cdf605cda8900f0c6c4d8098fb1ba951767fd2 (patch)
tree05f1d89fdf3f46d1cfd4350ee169ca9c282ae5e0 /ppapi/proxy/plugin_resource_tracker.h
parente1873b977ecb681d9261d9ce9fbe606e036b7d5b (diff)
downloadchromium_src-55cdf605cda8900f0c6c4d8098fb1ba951767fd2.zip
chromium_src-55cdf605cda8900f0c6c4d8098fb1ba951767fd2.tar.gz
chromium_src-55cdf605cda8900f0c6c4d8098fb1ba951767fd2.tar.bz2
Convert audio-related messages to the new thunk/API system for Pepper.
This has a bit of a change from the previous couple of resources that were converted in that the ResourceCreationProxy now calls a static proxy function for actually doing the work. It became too complicated and required that the ResourceCreationProxy know a lot about the internals of the objects. Did a little namespace cleanup. This renames "pp::shared_impl" to just use the "ppapi" namespace. The "shared_impl" was ugly and didn't help anything. Some files in that directory used "ppapi::shared_impl" instead which was even more confusing. Do a little build cleanup. The old ppapi_shared_proxy.gypi is now split into two sub-files, one for ppapi_shared, and one for ppapi_proxy. It's hopefully easier to find stuff now. Review URL: http://codereview.chromium.org/7014024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85303 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/plugin_resource_tracker.h')
-rw-r--r--ppapi/proxy/plugin_resource_tracker.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/ppapi/proxy/plugin_resource_tracker.h b/ppapi/proxy/plugin_resource_tracker.h
index 268709f..5dfdf82 100644
--- a/ppapi/proxy/plugin_resource_tracker.h
+++ b/ppapi/proxy/plugin_resource_tracker.h
@@ -25,7 +25,7 @@ namespace proxy {
class PluginDispatcher;
class PluginResource;
-class PluginResourceTracker : public ::ppapi::shared_impl::TrackerBase {
+class PluginResourceTracker : public ::ppapi::TrackerBase {
public:
// Called by tests that want to specify a specific ResourceTracker. This
// allows them to use a unique one each time and avoids singletons sticking
@@ -34,7 +34,7 @@ class PluginResourceTracker : public ::ppapi::shared_impl::TrackerBase {
// Returns the global singleton resource tracker for the plugin.
static PluginResourceTracker* GetInstance();
- static ::ppapi::shared_impl::TrackerBase* GetTrackerBaseInstance();
+ static ::ppapi::TrackerBase* GetTrackerBaseInstance();
// Returns the object associated with the given resource ID, or NULL if
// there isn't one.
@@ -55,9 +55,9 @@ class PluginResourceTracker : public ::ppapi::shared_impl::TrackerBase {
const HostResource& resource) const;
// TrackerBase.
- virtual ::ppapi::shared_impl::ResourceObjectBase* GetResourceAPI(
+ virtual ::ppapi::ResourceObjectBase* GetResourceAPI(
PP_Resource res);
- virtual ::ppapi::shared_impl::FunctionGroupBase* GetFunctionAPI(
+ virtual ::ppapi::FunctionGroupBase* GetFunctionAPI(
PP_Instance inst,
pp::proxy::InterfaceID id);