Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/renderer/webplugin_delegate_pepper.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 CHROME_RENDERER_WEBPLUGIN_DELEGATE_PEPPER_H_
 #define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PEPPER_H_
 #pragma once
 
 #include "build/build_config.h"
 
 #include <string>
 #include <vector>
 
 #include "base/id_map.h"
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
 #include "base/task.h"
 #include "chrome/renderer/pepper_devices.h"
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "gfx/native_widget_types.h"
 #include "gfx/rect.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserCompletion.h"
-#include "webkit/glue/plugins/webplugin_delegate.h"
+#include "webkit/plugins/npapi/webplugin_delegate.h"
 
 class FilePath;
 class RenderView;
 class WebCursor;
 class WebPluginDelegateProxy;
 
-namespace NPAPI {
+namespace webkit {
+namespace npapi {
 class PluginInstance;
 }
+}
 
 // An implementation of WebPluginDelegate for Pepper in-process plugins.
-class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate,
+class WebPluginDelegatePepper : public webkit::npapi::WebPluginDelegate,
                                 public WebKit::WebFileChooserCompletion {
  public:
   static WebPluginDelegatePepper* Create(
       const FilePath& filename,
       const std::string& mime_type,
       const base::WeakPtr<RenderView>& render_view);
 
-  NPAPI::PluginInstance* instance() { return instance_.get(); }
+  webkit::npapi::PluginInstance* instance() { return instance_.get(); }
 
   // WebKit::WebFileChooserCompletion implementation.
   virtual void didChooseFile(
       const WebKit::WebVector<WebKit::WebString>& file_names);
 
   // WebPluginDelegate implementation
   virtual bool Initialize(const GURL& url,
                           const std::vector<std::string>& arg_names,
                           const std::vector<std::string>& arg_values,
-                          webkit_glue::WebPlugin* plugin,
+                          webkit::npapi::WebPlugin* plugin,
                           bool load_manually);
   virtual void PluginDestroyed();
   virtual void UpdateGeometry(const gfx::Rect& window_rect,
                               const gfx::Rect& clip_rect);
   virtual void Paint(WebKit::WebCanvas* canvas, const gfx::Rect& rect);
   virtual void Print(gfx::NativeDrawingContext context);
   virtual void SetFocus(bool focused);
   virtual bool HandleInputEvent(const WebKit::WebInputEvent& event,
                                 WebKit::WebCursorInfo* cursor);
   virtual NPObject* GetPluginScriptableObject();
   virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason,
                                        int notify_id);
   virtual int GetProcessId();
   virtual void SendJavaScriptStream(const GURL& url,
                                     const std::string& result,
                                     bool success,
                                     int notify_id);
   virtual void DidReceiveManualResponse(const GURL& url,
                                         const std::string& mime_type,
                                         const std::string& headers,
                                         uint32 expected_length,
                                         uint32 last_modified);
   virtual void DidReceiveManualData(const char* buffer, int length);
   virtual void DidFinishManualLoading();
   virtual void DidManualLoadFail();
   virtual void InstallMissingPlugin();
-  virtual webkit_glue::WebPluginResourceClient* CreateResourceClient(
+  virtual webkit::npapi::WebPluginResourceClient* CreateResourceClient(
       unsigned long resource_id, const GURL& url, int notify_id);
-  virtual webkit_glue::WebPluginResourceClient* CreateSeekableResourceClient(
+  virtual webkit::npapi::WebPluginResourceClient* CreateSeekableResourceClient(
       unsigned long resource_id, int range_request_id);
   virtual bool StartFind(const string16& search_text,
                          bool case_sensitive,
                          int identifier);
   virtual void SelectFindResult(bool forward);
   virtual void StopFind();
   virtual void NumberOfFindResultsChanged(int total, bool final_result);
   virtual void SelectedFindResultChanged(int index);
   virtual bool ChooseFile(const char* mime_types,
                           int mode,
@@ skipping 106 matching lines @@
   // when an ack was received that the browser copied it to the screen
   // (FlushedPaint).
   void RenderViewInitiatedPaint();
   void RenderViewFlushedPaint();
 
   Graphics2DDeviceContext* GetGraphicsContext(NPDeviceContext2D* context);
 
  private:
   WebPluginDelegatePepper(
       const base::WeakPtr<RenderView>& render_view,
-      NPAPI::PluginInstance *instance);
+      webkit::npapi::PluginInstance *instance);
   ~WebPluginDelegatePepper();
 
   // Set a task that calls the repaint callback the next time the window
   // is invalid and needs to be repainted.
   void ScheduleHandleRepaint(NPP npp, NPDeviceContext3D* context);
 
   //-----------------------------------------
   // used for windowed and windowless plugins
 
   // Closes down and destroys our plugin instance.
@@ skipping 46 matching lines @@
   // the page.
   void SendNestedDelegateGeometryToBrowser(const gfx::Rect& window_rect,
                                            const gfx::Rect& clip_rect);
 
   // Returns the selection.  If nothing is selected, returns an empty string.
   // If html is true, it will return a string only if html data is available.
   string16 GetSelectedText(bool html) const;
 
   base::WeakPtr<RenderView> render_view_;
 
-  webkit_glue::WebPlugin* plugin_;
-  scoped_refptr<NPAPI::PluginInstance> instance_;
+  webkit::npapi::WebPlugin* plugin_;
+  scoped_refptr<webkit::npapi::PluginInstance> instance_;
 
   NPWindow window_;
   gfx::Rect window_rect_;
   gfx::Rect clip_rect_;
   std::vector<gfx::Rect> cutout_rects_;
 
   // Open device contexts
   typedef IDMap<Graphics2DDeviceContext, IDMapOwnPointer> Graphics2DMap;
   Graphics2DMap graphic2d_contexts_;
   IDMap<AudioDeviceContext, IDMapOwnPointer> audio_contexts_;
@@ skipping 46 matching lines @@
   // pointer to the callback specified by the plugin. Will be NULL otherwise.
   NPChooseFileCallback current_choose_file_callback_;
   void* current_choose_file_user_data_;
 
   scoped_ptr<WebKit::WebCursorInfo> cursor_;
 
   DISALLOW_COPY_AND_ASSIGN(WebPluginDelegatePepper);
 };
 
 #endif  // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PEPPER_H_