1 files changed, 9 insertions, 4 deletions
diff --git a/chrome/common/pepper_plugin_registry.h b/chrome/common/pepper_plugin_registry.h
index 60762c5..424ed1a 100644
--- a/chrome/common/pepper_plugin_registry.h
+++ b/chrome/common/pepper_plugin_registry.h
@@ -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();
@@ -40,6 +40,11 @@ class PepperPluginRegistry {
   static const char* kPDFPluginExtension;
   static const char* kPDFPluginDescription;
 
+  static const char* kNaClPluginName;
+  static const char* kNaClPluginMimeType;
+  static const char* kNaClPluginExtension;
+  static const char* kNaClPluginDescription;
+
   static PepperPluginRegistry* GetInstance();
 
   // Returns the list of known pepper plugins.  This method is static so that
@@ -59,7 +64,7 @@ class PepperPluginRegistry {
   // 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::ppapi::PluginModule* GetModule(const FilePath& path) const;
 
   ~PepperPluginRegistry();
 
@@ -69,14 +74,14 @@ class PepperPluginRegistry {
 
   struct InternalPluginInfo : public PepperPluginInfo {
     InternalPluginInfo();  // Sets |is_internal|.
-    pepper::PluginModule::EntryPoints entry_points;
+    webkit::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::ppapi::PluginModule> ModuleHandle;
   typedef std::map<FilePath, ModuleHandle> ModuleMap;
   ModuleMap modules_;
 };