Reverting 23406.

webkit/default_plugin/plugin_impl_win.h

 // Copyright (c) 2006-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 WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
 #define WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_
 
+#include <atlbase.h>
+#include <atlwin.h>
 #include <string>
 #include <vector>
 
-#include "base/window_impl.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "webkit/default_plugin/install_dialog.h"
 #include "webkit/default_plugin/plugin_database_handler.h"
 #include "webkit/default_plugin/plugin_install_job_monitor.h"
 
 // Possible plugin installer states.
 enum PluginInstallerState {
   PluginInstallerStateUndefined,
   PluginListDownloadInitiated,
   PluginListDownloaded,
   PluginListDownloadedPluginNotFound,
   PluginListDownloadFailed,
   PluginDownloadInitiated,
   PluginDownloadCompleted,
   PluginDownloadFailed,
   PluginInstallerLaunchSuccess,
   PluginInstallerLaunchFailure
 };
 
 class ActiveXInstaller;
 class PluginInstallDialog;
 class PluginDatabaseHandler;
 
 // Provides the plugin installation functionality. This class is
 // instantiated with the information like the mime type of the
 // target plugin, the display mode, etc.
-class PluginInstallerImpl : public base::WindowImpl {
+class PluginInstallerImpl : public CWindowImpl<PluginInstallerImpl> {
  public:
   static const int kRefreshPluginsMessage  = WM_APP + 1;
   static const int kInstallMissingPluginMessage = WM_APP + 2;
   static const int kActivexInstallResult = WM_USER + 74;
 
   // mode is the plugin instantiation mode, i.e. whether it is a full
   // page plugin (NP_FULL) or an embedded plugin (NP_EMBED)
   explicit PluginInstallerImpl(int16 mode);
   virtual ~PluginInstallerImpl();
 
-  BEGIN_MSG_MAP_EX(PluginInstallerImpl)
+  BEGIN_MSG_MAP(PluginInstallerImpl)
     MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackGround)
     MESSAGE_HANDLER(WM_PAINT, OnPaint)
     MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown)
     MESSAGE_HANDLER(kRefreshPluginsMessage, OnRefreshPlugins)
     MESSAGE_HANDLER(WM_COPYDATA, OnCopyData)
     MESSAGE_HANDLER(WM_SETCURSOR, OnSetCursor)
     MESSAGE_HANDLER(kActivexInstallResult, OnActiveXInstallResult)
   END_MSG_MAP()
 
   // Initializes the plugin with the instance information, mime type
@@ skipping 83 matching lines @@
   //   Describes why the notification was sent.
   void URLNotify(const char* url, NPReason reason);
 
   // Initiates activex installs if applicable.
   // Note: The null plugin being a windowed plugin does not have to implement
   // NPP_HandleEvent. However to handle activex installations, we have this
   // hack to allow the renderer to send out a request for installing the
   // activex.
   int16 NPP_HandleEvent(void* event);
 
+  HWND window() const { return m_hWnd; }
   const std::string& mime_type() const { return mime_type_; }
 
   // Replaces a resource string with the placeholder passed in as an argument
   //
   // Parameters:
   // message_id_with_placeholders
   //   The resource id of the string with placeholders. This is only used if
   //   the placeholder string (the replacement_string) parameter is valid.
   // message_id_without_placeholders
   //   The resource id of the string to be returned if the placeholder is
@@ skipping 203 matching lines @@
   HFONT bold_font_;
   HFONT regular_font_;
   HFONT underline_font_;
   // Tooltip Window.
   HWND tooltip_;
   // ActiveX related.
   std::string activex_codebase_;
   std::string activex_clsid_;
   CComObject<ActiveXInstaller>* activex_installer_;
 
-  DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl);
+  DISALLOW_EVIL_CONSTRUCTORS(PluginInstallerImpl);
 };
 
 
 #endif  // WEBKIT_DEFAULT_PLUGIN_PLUGIN_IMPL_WIN_H_