summaryrefslogtreecommitdiffstats
path: root/content/common/pepper_plugin_registry.h
diff options
context:
space:
mode:
authoralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 07:36:50 +0000
committeralokp@chromium.org <alokp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-15 07:36:50 +0000
commit41dbab71f2dd13c1cfad3b84d0e7bd5ef78bf6d4 (patch)
tree6ffb43c2950eb3c88268408e420649ab38e141eb /content/common/pepper_plugin_registry.h
parent94fa1b671df11d068e34de63e0ad5612d99ccf89 (diff)
downloadchromium_src-41dbab71f2dd13c1cfad3b84d0e7bd5ef78bf6d4.zip
chromium_src-41dbab71f2dd13c1cfad3b84d0e7bd5ef78bf6d4.tar.gz
chromium_src-41dbab71f2dd13c1cfad3b84d0e7bd5ef78bf6d4.tar.bz2
Removed the dependency of PepperPluginRegistry on Pepper proxy.
We would need to move PepperPluginRegistry to webkit/plugins/ppapi so that it can be used by test_shell. But before we can move it, we need to remove all dependencies on content and pepper/proxy. TEST=Manually ran pepper 3d demos in-process and out-of-process. Review URL: http://codereview.chromium.org/7885009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/pepper_plugin_registry.h')
-rw-r--r--content/common/pepper_plugin_registry.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/content/common/pepper_plugin_registry.h b/content/common/pepper_plugin_registry.h
index ee2404a4..2ec144c 100644
--- a/content/common/pepper_plugin_registry.h
+++ b/content/common/pepper_plugin_registry.h
@@ -13,7 +13,6 @@
#include "base/file_path.h"
#include "content/common/content_export.h"
-#include "ppapi/proxy/proxy_channel.h"
#include "webkit/plugins/ppapi/plugin_delegate.h"
#include "webkit/plugins/ppapi/plugin_module.h"
#include "webkit/plugins/webplugininfo.h"
@@ -59,8 +58,7 @@ bool MakePepperPluginInfo(const webkit::WebPluginInfo& webplugin_info,
// is a list of all live modules (some of which may be out-of-process and hence
// not preloaded).
class PepperPluginRegistry
- : public webkit::ppapi::PluginDelegate::ModuleLifetime,
- public ppapi::proxy::ProxyChannel::Delegate {
+ : public webkit::ppapi::PluginDelegate::ModuleLifetime {
public:
~PepperPluginRegistry();
@@ -105,10 +103,6 @@ class PepperPluginRegistry
private:
PepperPluginRegistry();
- // ProxyChannel::Delegate implementation.
- virtual base::MessageLoopProxy* GetIPCMessageLoop();
- virtual base::WaitableEvent* GetShutdownEvent();
-
// All known pepper plugins.
std::vector<PepperPluginInfo> plugin_list_;