| 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_;
|
| };
|
|
|