Lots of small nits to help to split off webkit.dll....

chrome/plugin/webplugin_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_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
 #define CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__
 
 #include "base/hash_tables.h"
 #include "base/ref_counted.h"
 #include "base/scoped_handle.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
 #include "base/timer.h"
 #include "chrome/common/ipc_message.h"
 #include "chrome/common/chrome_plugin_api.h"
 #include "webkit/glue/webplugin.h"
 
 namespace base {
 class WaitableEvent;
 }
 
 class PluginChannel;
-class WebPluginDelegateImpl;
+class WebPluginDelegate;
 
 // This is an implementation of WebPlugin that proxies all calls to the
 // renderer.
 class WebPluginProxy : public WebPlugin {
  public:
   // Creates a new proxy for WebPlugin, using the given sender to send the
   // marshalled WebPlugin calls.
   WebPluginProxy(PluginChannel* channel,
                  int route_id,
-                 WebPluginDelegateImpl* delegate,
+                 WebPluginDelegate* delegate,
                  HANDLE modal_dialog_event);
   ~WebPluginProxy();
 
   // WebPlugin overrides
   void SetWindow(HWND window, HANDLE pump_messages_event);
   void CancelResource(int id);
   void Invalidate();
   void InvalidateRect(const gfx::Rect& rect);
   NPObject* GetWindowScriptNPObject();
   NPObject* GetPluginElement();
@@ skipping 74 matching lines @@
   // transform of the local HDC.
   void UpdateTransform();
 
   typedef base::hash_map<int, WebPluginResourceClient*> ResourceClientMap;
   ResourceClientMap resource_clients_;
 
   scoped_refptr<PluginChannel> channel_;
   int route_id_;
   NPObject* window_npobject_;
   NPObject* plugin_element_;
-  WebPluginDelegateImpl* delegate_;
+  WebPluginDelegate* delegate_;
   gfx::Rect damaged_rect_;
   bool waiting_for_paint_;
   uint32 cp_browsing_context_;
   scoped_ptr<base::WaitableEvent> modal_dialog_event_;
   HWND parent_window_;
 
   // Variables used for desynchronized windowless plugin painting.  See note in
   // webplugin_delegate_proxy.h for how this works.
 
   // These hold the bitmap where the plugin draws.
   ScopedHandle windowless_shared_section_;
   ScopedBitmap windowless_bitmap_;
   ScopedHDC windowless_hdc_;
 
   // These hold the bitmap of the background image.
   ScopedHandle background_shared_section_;
   ScopedBitmap background_bitmap_;
   ScopedHDC background_hdc_;
 
   ScopedRunnableMethodFactory<WebPluginProxy> runnable_method_factory_;
 };
 
 #endif  // CHROME_PLUGIN_PLUGIN_WEBPLUGIN_PROXY_H__