This changelist fixes some issues with the NPAPI WMP plugin work in Chrome. ...

chrome/renderer/webplugin_delegate_proxy.h

 // Copyright (c) 2006-2008 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_PROXY_H__
 #define CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H__
 
 #include <string>
 #include <vector>
 
 #include "base/file_path.h"
 #include "base/gfx/rect.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/renderer/plugin_channel_host.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
 #include "skia/ext/platform_canvas.h"
 #include "webkit/glue/webplugin.h"
+#include "webkit/glue/webplugininfo.h"
 #include "webkit/glue/webplugin_delegate.h"
 
 struct NPObject;
 class NPObjectStub;
 struct NPVariant_Param;
 struct PluginHostMsg_URLRequest_Params;
 class RenderView;
 class SkBitmap;
 
 namespace base {
 class SharedMemory;
 class WaitableEvent;
 }
 
 // An implementation of WebPluginDelegate that proxies all calls to
 // the plugin process.
 class WebPluginDelegateProxy :
     public webkit_glue::WebPluginDelegate,
     public IPC::Channel::Listener,
     public IPC::Message::Sender,
     public base::SupportsWeakPtr<WebPluginDelegateProxy> {
  public:
-  static WebPluginDelegateProxy* Create(
-      const GURL& url,
-      const std::string& mime_type,
-      const std::string& clsid,
-      const base::WeakPtr<RenderView>& render_view);
+  WebPluginDelegateProxy(const std::string& mime_type,
+                         const std::string& clsid,
+                         const base::WeakPtr<RenderView>& render_view);
 
   // Called to drop our pointer to the window script object.
   void DropWindowScriptObject() { window_script_object_ = NULL; }
 
   // WebPluginDelegate implementation:
   virtual void PluginDestroyed();
-  virtual bool Initialize(const GURL& url, char** argn, char** argv, int argc,
-                          webkit_glue::WebPlugin* plugin, bool load_manually);
+  virtual bool Initialize(const GURL& url,
+                          const std::vector<std::string>& arg_names,
+                          const std::vector<std::string>& arg_values,
+                          webkit_glue::WebPlugin* plugin,
+                          bool load_manually);
   virtual void UpdateGeometry(const gfx::Rect& window_rect,
                               const gfx::Rect& clip_rect);
   virtual void Paint(gfx::NativeDrawingContext context, const gfx::Rect& rect);
   virtual void Print(gfx::NativeDrawingContext context);
   virtual NPObject* GetPluginScriptableObject();
   virtual void DidFinishLoadWithReason(const GURL& url, NPReason reason,
                                        intptr_t notify_data);
   virtual void SetFocus();
   virtual bool HandleInputEvent(const WebKit::WebInputEvent& event,
                                 WebKit::WebCursorInfo* cursor);
@@ skipping 12 matching lines @@
                                     intptr_t notify_data);
 
   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 FilePath GetPluginPath();
   virtual void InstallMissingPlugin();
   virtual webkit_glue::WebPluginResourceClient* CreateResourceClient(
       int resource_id,
       const GURL& url,
       bool notify_needed,
       intptr_t notify_data,
       intptr_t existing_stream);
-  virtual bool IsWindowless() const;
-  virtual gfx::Rect GetRect() const;
-  virtual gfx::Rect GetClipRect() const;
-  virtual int GetQuirks() const;
 
  protected:
   template<class WebPluginDelegateProxy> friend class DeleteTask;
   ~WebPluginDelegateProxy();
 
  private:
-  WebPluginDelegateProxy(const std::string& mime_type,
-                         const std::string& clsid,
-                         const base::WeakPtr<RenderView>& render_view);
-
   // Message handlers for messages that proxy WebPlugin methods, which
   // we translate into calls to the real WebPlugin.
   void OnSetWindow(gfx::PluginWindowHandle window);
 #if defined(OS_WIN)
   void OnSetWindowlessPumpEvent(HANDLE modal_loop_pump_messages_event);
 #endif
   void OnCompleteURL(const std::string& url_in, std::string* url_out,
                      bool* result);
   void OnHandleURLRequest(const PluginHostMsg_URLRequest_Params& params);
   void OnCancelResource(int id);
@@ skipping 47 matching lines @@
   void WillDestroyWindow();
 
   base::WeakPtr<RenderView> render_view_;
   webkit_glue::WebPlugin* plugin_;
   bool windowless_;
   gfx::PluginWindowHandle window_;
   scoped_refptr<PluginChannelHost> channel_host_;
   std::string mime_type_;
   std::string clsid_;
   int instance_id_;
-  FilePath plugin_path_;
+  WebPluginInfo info_;
 
   gfx::Rect plugin_rect_;
 
   NPObject* npobject_;
   NPObjectStub* window_script_object_;
 
   // Event passed in by the plugin process and is used to decide if
   // messages need to be pumped in the NPP_HandleEvent sync call.
   scoped_ptr<base::WaitableEvent> modal_loop_pump_messages_event_;
 
@@ skipping 18 matching lines @@
   // This lets us know which portion of the backing store has been painted into.
   gfx::Rect backing_store_painted_;
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
   DISALLOW_EVIL_CONSTRUCTORS(WebPluginDelegateProxy);
 };
 
 #endif  // CHROME_RENDERER_WEBPLUGIN_DELEGATE_PROXY_H_