Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8296)

Unified Diff: chrome/common/pepper_plugin_registry.h

Issue 6628019: Ensure that PP_Instance values are unique within a plugin process in addition... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/DEPS ('k') | chrome/common/pepper_plugin_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
« no previous file with comments | « chrome/common/DEPS ('k') | chrome/common/pepper_plugin_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698