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

Unified Diff: chrome/common/pepper_plugin_registry.h

Issue 5828003: Move the Pepper implementation from webkit/glue/plugins/pepper_* to... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years 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
Index: chrome/common/pepper_plugin_registry.h
===================================================================
--- chrome/common/pepper_plugin_registry.h (revision 69282)
+++ chrome/common/pepper_plugin_registry.h (working copy)
@@ -11,7 +11,7 @@
#include <vector>
#include "base/file_path.h"
-#include "webkit/glue/plugins/pepper_plugin_module.h"
+#include "webkit/plugins/ppapi/plugin_module.h"
struct PepperPluginInfo {
PepperPluginInfo();
@@ -59,7 +59,7 @@
// Returns a preloaded module for the given path. This only works for
// non-out-of-process plugins since we preload them so they will run in the
// sandbox. Returns NULL if the plugin hasn't been preloaded.
- pepper::PluginModule* GetModule(const FilePath& path) const;
+ webkit::plugins::ppapi::PluginModule* GetModule(const FilePath& path) const;
~PepperPluginRegistry();
@@ -69,14 +69,14 @@
struct InternalPluginInfo : public PepperPluginInfo {
InternalPluginInfo(); // Sets |is_internal|.
- pepper::PluginModule::EntryPoints entry_points;
+ webkit::plugins::ppapi::PluginModule::EntryPoints entry_points;
};
typedef std::vector<InternalPluginInfo> InternalPluginInfoList;
static void GetInternalPluginInfo(InternalPluginInfoList* plugin_info);
PepperPluginRegistry();
- typedef scoped_refptr<pepper::PluginModule> ModuleHandle;
+ typedef scoped_refptr<webkit::plugins::ppapi::PluginModule> ModuleHandle;
typedef std::map<FilePath, ModuleHandle> ModuleMap;
ModuleMap modules_;
};

Powered by Google App Engine
This is Rietveld 408576698