diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 08:15:50 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-15 08:15:50 +0000 |
| commit | 69426ecc0ea17460c5328c4adeb39daf866d98b8 (patch) | |
| tree | 43a8171ec4f32b3a1c0fded30e995dd4a86d13ca /content/common/pepper_plugin_registry.h | |
| parent | 06f23ddc56e04e550f204c562753a93d77cbf9b3 (diff) | |
| download | chromium_src-69426ecc0ea17460c5328c4adeb39daf866d98b8.zip chromium_src-69426ecc0ea17460c5328c4adeb39daf866d98b8.tar.gz chromium_src-69426ecc0ea17460c5328c4adeb39daf866d98b8.tar.bz2 | |
Revert 101259 - 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
TBR=alokp@chromium.org
Review URL: http://codereview.chromium.org/7903002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common/pepper_plugin_registry.h')
| -rw-r--r-- | content/common/pepper_plugin_registry.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/content/common/pepper_plugin_registry.h b/content/common/pepper_plugin_registry.h index 2ec144c..ee2404a4 100644 --- a/content/common/pepper_plugin_registry.h +++ b/content/common/pepper_plugin_registry.h @@ -13,6 +13,7 @@ #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" @@ -58,7 +59,8 @@ 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 webkit::ppapi::PluginDelegate::ModuleLifetime, + public ppapi::proxy::ProxyChannel::Delegate { public: ~PepperPluginRegistry(); @@ -103,6 +105,10 @@ class PepperPluginRegistry private: PepperPluginRegistry(); + // ProxyChannel::Delegate implementation. + virtual base::MessageLoopProxy* GetIPCMessageLoop(); + virtual base::WaitableEvent* GetShutdownEvent(); + // All known pepper plugins. std::vector<PepperPluginInfo> plugin_list_; |