summaryrefslogtreecommitdiffstats
path: root/ppapi/proxy/plugin_globals.h
diff options
context:
space:
mode:
authorsail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 22:16:26 +0000
committersail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-18 22:16:26 +0000
commitfaa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4 (patch)
treef3f7c49fa06c0b32a78723f77bc3581559abb0f3 /ppapi/proxy/plugin_globals.h
parentde3c5ea947350a310bcdaabe7a8cb2dbef3fc9a8 (diff)
downloadchromium_src-faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4.zip
chromium_src-faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4.tar.gz
chromium_src-faa2a45bf31af9e1131bb0cfa17ab1e2400ec0e4.tar.bz2
Revert 106142 - Add a new globals object for PPAPI tracking information.
This adds a specialization on the host and plugin side of the proxy. This replaces the ad-hoc singleton tracking done by the resource and var trackers with just being getters on this global object. Most code can use the single PpapiGlobals class. I also allow code to get the host and plugin specializations since some code needs access to some specific features of each side. In a later pass I'll move the other stuff out of TrackerBase and delete it. TEST=none BUG=none Review URL: http://codereview.chromium.org/8316008 TBR=brettw@chromium.org Review URL: http://codereview.chromium.org/8342016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/proxy/plugin_globals.h')
-rw-r--r--ppapi/proxy/plugin_globals.h50
1 files changed, 0 insertions, 50 deletions
diff --git a/ppapi/proxy/plugin_globals.h b/ppapi/proxy/plugin_globals.h
deleted file mode 100644
index 141b904..0000000
--- a/ppapi/proxy/plugin_globals.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef PPAPI_PROXY_PLUGIN_GLOBALS_H_
-#define PPAPI_PROXY_PLUGIN_GLOBALS_H_
-
-#include "base/compiler_specific.h"
-#include "ppapi/proxy/plugin_resource_tracker.h"
-#include "ppapi/proxy/plugin_var_tracker.h"
-#include "ppapi/shared_impl/ppapi_globals.h"
-
-namespace ppapi {
-namespace proxy {
-
-class PluginGlobals : public PpapiGlobals {
- public:
- PluginGlobals();
- virtual ~PluginGlobals();
-
- // Getter for the global singleton. Generally, you should use
- // PpapiGlobals::Get() when possible. Use this only when you need some
- // plugin-specific functionality.
- inline static PluginGlobals* Get() { return plugin_globals_; }
-
- // PpapiGlobals implementation.
- virtual ResourceTracker* GetResourceTracker() OVERRIDE;
- virtual VarTracker* GetVarTracker() OVERRIDE;
-
- // Getters for the plugin-specific versions.
- PluginResourceTracker* plugin_resource_tracker() {
- return &plugin_resource_tracker_;
- }
- PluginVarTracker* plugin_var_tracker() {
- return &plugin_var_tracker_;
- }
-
- private:
- static PluginGlobals* plugin_globals_;
-
- PluginResourceTracker plugin_resource_tracker_;
- PluginVarTracker plugin_var_tracker_;
-
- DISALLOW_COPY_AND_ASSIGN(PluginGlobals);
-};
-
-} // namespace proxy
-} // namespace ppapi
-
-#endif // PPAPI_PROXY_PLUGIN_GLOBALS_H_