Move the Pepper implementation from webkit/glue/plugins/pepper_* to...

webkit/plugins/ppapi/plugin_delegate.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_DELEGATE_H_
-#define WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_DELEGATE_H_
+#ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
+#define WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/platform_file.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.h"
 #include "gfx/size.h"
 #include "googleurl/src/gurl.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_stdint.h"
 #include "webkit/fileapi/file_system_types.h"
-#include "webkit/glue/plugins/pepper_dir_contents.h"
+#include "webkit/plugins/ppapi/dir_contents.h"
 
 class AudioMessageFilter;
 class GURL;
 
 namespace base {
 class MessageLoopProxy;
 class Time;
 }
 
 namespace fileapi {
@@ skipping 18 matching lines @@
 class WebFileChooserCompletion;
 struct WebFileChooserParams;
 }
 
 struct PP_VideoCompressedDataBuffer_Dev;
 struct PP_VideoDecoderConfig_Dev;
 struct PP_VideoUncompressedDataBuffer_Dev;
 
 class TransportDIB;
 
-namespace pepper {
+namespace webkit {
+namespace ppapi {
 
 class FileIO;
 class PluginInstance;
 class FullscreenContainer;
 
 // Virtual interface that the browser implements to implement features for
-// Pepper plugins.
+// PPAPI plugins.
 class PluginDelegate {
  public:
   // This class is implemented by the PluginDelegate implementation and is
   // designed to manage the lifetime and communicatin with the proxy's
-  // HostDispatcher for out-of-process pepper plugins.
+  // HostDispatcher for out-of-process PPAPI plugins.
   //
-  // The point of this is to avoid having a relationship from the pepper plugin
+  // The point of this is to avoid having a relationship from the PPAPI plugin
   // implementation to the ppapi proxy code. Otherwise, things like the IPC
   // system will be dependencies of the webkit directory, which we don't want.
   //
   // The PluginModule will scope the lifetime of this object to its own
   // lifetime, so the implementation can use this to manage the HostDispatcher
   // lifetime without introducing the dependency.
   class OutOfProcessProxy {
    public:
     virtual ~OutOfProcessProxy() {}
 
@@ skipping 95 matching lines @@
     virtual ~PlatformVideoDecoder() {}
 
     // Returns false on failure.
     virtual bool Decode(PP_VideoCompressedDataBuffer_Dev& input_buffer) = 0;
     virtual int32_t Flush(PP_CompletionCallback& callback) = 0;
     virtual bool ReturnUncompressedDataBuffer(
         PP_VideoUncompressedDataBuffer_Dev& buffer) = 0;
   };
 
   // Indicates that the given instance has been created.
-  virtual void InstanceCreated(pepper::PluginInstance* instance) = 0;
+  virtual void InstanceCreated(PluginInstance* instance) = 0;
 
   // Indicates that the given instance is being destroyed. This is called from
   // the destructor, so it's important that the instance is not dereferenced
   // from this call.
-  virtual void InstanceDeleted(pepper::PluginInstance* instance) = 0;
+  virtual void InstanceDeleted(PluginInstance* instance) = 0;
 
   // The caller will own the pointer returned from this.
   virtual PlatformImage2D* CreateImage2D(int width, int height) = 0;
 
   // The caller will own the pointer returned from this.
   virtual PlatformContext3D* CreateContext3D() = 0;
 
   // The caller will own the pointer returned from this.
   virtual PlatformVideoDecoder* CreateVideoDecoder(
       const PP_VideoDecoderConfig_Dev& decoder_config) = 0;
@@ skipping 62 matching lines @@
   virtual base::PlatformFileError CreateModuleLocalDir(
       const std::string& module_name,
       const FilePath& path) = 0;
   virtual base::PlatformFileError QueryModuleLocalFile(
       const std::string& module_name,
       const FilePath& path,
       base::PlatformFileInfo* info) = 0;
   virtual base::PlatformFileError GetModuleLocalDirContents(
       const std::string& module_name,
       const FilePath& path,
-      PepperDirContents* contents) = 0;
+      DirContents* contents) = 0;
 
   // Returns a MessageLoopProxy instance associated with the message loop
   // of the file thread in this renderer.
   virtual scoped_refptr<base::MessageLoopProxy>
       GetFileThreadMessageLoopProxy() = 0;
 
   // Create a fullscreen container for a plugin instance. This effectively
   // switches the plugin to fullscreen.
   virtual FullscreenContainer* CreateFullscreenContainer(
       PluginInstance* instance) = 0;
@@ skipping 10 matching lines @@
   virtual std::string ResolveProxy(const GURL& url) = 0;
 
   // Tell the browser when resource loading starts/ends.
   virtual void DidStartLoading() = 0;
   virtual void DidStopLoading() = 0;
 
   // Sets restrictions on how the content can be used (i.e. no print/copy).
   virtual void SetContentRestriction(int restrictions) = 0;
 };
 
-}  // namespace pepper
+}  // namespace ppapi
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_PLUGINS_PEPPER_PLUGIN_DELEGATE_H_
+#endif  // WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_