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

Unified Diff: content/common/pepper_plugin_registry.h

Issue 20165002: Move webkit/plugins/ppapi to content/renderer/pepper. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: more more clang fun Created 7 years, 5 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 | « content/common/DEPS ('k') | content/common/pepper_plugin_registry.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/pepper_plugin_registry.h
===================================================================
--- content/common/pepper_plugin_registry.h (revision 213561)
+++ content/common/pepper_plugin_registry.h (working copy)
@@ -9,8 +9,10 @@
#include <map>
#include "content/public/common/pepper_plugin_info.h"
-#include "webkit/plugins/ppapi/plugin_delegate.h"
+// TODO(jam): refactor
+#include "content/renderer/pepper/plugin_module.h"
+
namespace content {
// Constructs a PepperPluginInfo from a WebPluginInfo. Returns false if
@@ -24,8 +26,7 @@
// It keeps two lists. One list of preloaded in-process modules, and one list
// 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 {
+class PepperPluginRegistry {
public:
~PepperPluginRegistry();
@@ -64,9 +65,7 @@
void AddLiveModule(const base::FilePath& path,
webkit::ppapi::PluginModule* module);
- // ModuleLifetime implementation.
- virtual void PluginModuleDead(
- webkit::ppapi::PluginModule* dead_module) OVERRIDE;
+ void PluginModuleDead(webkit::ppapi::PluginModule* dead_module);
private:
PepperPluginRegistry();
« no previous file with comments | « content/common/DEPS ('k') | content/common/pepper_plugin_registry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698