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

chrome/plugin/webplugin_proxy.h

 // Copyright (c) 2009 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_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
 #define CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
 
 #include <string>
 
 #include "base/hash_tables.h"
@@ skipping 10 matching lines @@
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
 #include "webkit/glue/webplugin.h"
 
 class PluginChannel;
 
 namespace base {
 class WaitableEvent;
 }
 
-namespace webkit_glue {
-class WebPluginDelegate;
-}
+class WebPluginDelegateImpl;
 
 // This is an implementation of WebPlugin that proxies all calls to the
 // renderer.
 class WebPluginProxy : public webkit_glue::WebPlugin {
  public:
   // Creates a new proxy for WebPlugin, using the given sender to send the
   // marshalled WebPlugin calls.
   WebPluginProxy(PluginChannel* channel,
                  int route_id,
                  const GURL& page_url);
   ~WebPluginProxy();
 
-  void set_delegate(webkit_glue::WebPluginDelegate* d) { delegate_ = d; }
+  void set_delegate(WebPluginDelegateImpl* d) { delegate_ = d; }
 
   // WebPlugin overrides
   void SetWindow(gfx::PluginWindowHandle window);
   void WillDestroyWindow(gfx::PluginWindowHandle window);
 #if defined(OS_WIN)
   void SetWindowlessPumpEvent(HANDLE pump_messages_event);
   // Returns true on success.
   bool SetModalDialogEvent(HANDLE modal_dialog_event);
 #endif
   void CancelResource(int id);
@@ skipping 101 matching lines @@
 
   typedef base::hash_map<int, webkit_glue::WebPluginResourceClient*>
       ResourceClientMap;
   ResourceClientMap resource_clients_;
 
   scoped_refptr<PluginChannel> channel_;
   int route_id_;
   uint32 cp_browsing_context_;
   NPObject* window_npobject_;
   NPObject* plugin_element_;
-  webkit_glue::WebPluginDelegate* delegate_;
+  WebPluginDelegateImpl* delegate_;
   gfx::Rect damaged_rect_;
   bool waiting_for_paint_;
   scoped_ptr<base::WaitableEvent> modal_dialog_event_;
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
 #if defined(OS_WIN)
   // Variables used for desynchronized windowless plugin painting.  See note in
   // webplugin_delegate_proxy.h for how this works.
 
@@ skipping 15 matching lines @@
   scoped_ptr<TransportDIB> windowless_dib_;
   scoped_ptr<TransportDIB> background_dib_;
   scoped_ptr<skia::PlatformCanvas> windowless_canvas_;
   scoped_ptr<skia::PlatformCanvas> background_canvas_;
 #endif
 
   ScopedRunnableMethodFactory<WebPluginProxy> runnable_method_factory_;
 };
 
 #endif  // CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__