Index: chrome/common/pepper_plugin_registry.h |
=================================================================== |
--- chrome/common/pepper_plugin_registry.h (revision 77663) |
+++ chrome/common/pepper_plugin_registry.h (working copy) |
@@ -11,6 +11,7 @@ |
#include <vector> |
#include "base/file_path.h" |
+#include "ppapi/proxy/dispatcher.h" |
#include "webkit/plugins/npapi/webplugininfo.h" |
#include "webkit/plugins/ppapi/plugin_delegate.h" |
#include "webkit/plugins/ppapi/plugin_module.h" |
@@ -45,7 +46,8 @@ |
// 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 pp::proxy::Dispatcher::Delegate { |
public: |
~PepperPluginRegistry(); |
@@ -90,6 +92,11 @@ |
private: |
PepperPluginRegistry(); |
+ // Dispatcher::Delegate implementation. |
+ virtual MessageLoop* GetIPCMessageLoop(); |
+ virtual base::WaitableEvent* GetShutdownEvent(); |
+ virtual std::set<PP_Instance>* GetGloballySeenInstanceIDSet(); |
+ |
// All known pepper plugins. |
std::vector<PepperPluginInfo> plugin_list_; |