diff options
author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-14 01:12:38 +0000 |
---|---|---|
committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-14 01:12:38 +0000 |
commit | d60cd48c0f4e822b3f14b72ef95667845aefce29 (patch) | |
tree | 0ff1158c36c6b60be74bf23bec59bd08726e9287 /webkit/default_plugin/plugin_impl_win.h | |
parent | ed3ce0d59e2f52f805a8a76b112bfd48156416d0 (diff) | |
download | chromium_src-d60cd48c0f4e822b3f14b72ef95667845aefce29.zip chromium_src-d60cd48c0f4e822b3f14b72ef95667845aefce29.tar.gz chromium_src-d60cd48c0f4e822b3f14b72ef95667845aefce29.tar.bz2 |
Change PluginInstallImpl to use base::WindowImpl instead of CWindowImpl to reduce a dependency on ATL.
BUG=5023
TEST=Uninstall flash. Visit hulu.com and install the flash plugin.
Review URL: http://codereview.chromium.org/165469
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23406 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/default_plugin/plugin_impl_win.h')
-rw-r--r-- | webkit/default_plugin/plugin_impl_win.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/webkit/default_plugin/plugin_impl_win.h b/webkit/default_plugin/plugin_impl_win.h index 66a97c6..a0e5596 100644 --- a/webkit/default_plugin/plugin_impl_win.h +++ b/webkit/default_plugin/plugin_impl_win.h @@ -5,11 +5,10 @@ #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" @@ -36,7 +35,7 @@ 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 CWindowImpl<PluginInstallerImpl> { +class PluginInstallerImpl : public base::WindowImpl { public: static const int kRefreshPluginsMessage = WM_APP + 1; static const int kInstallMissingPluginMessage = WM_APP + 2; @@ -47,7 +46,7 @@ class PluginInstallerImpl : public CWindowImpl<PluginInstallerImpl> { explicit PluginInstallerImpl(int16 mode); virtual ~PluginInstallerImpl(); - BEGIN_MSG_MAP(PluginInstallerImpl) + BEGIN_MSG_MAP_EX(PluginInstallerImpl) MESSAGE_HANDLER(WM_ERASEBKGND, OnEraseBackGround) MESSAGE_HANDLER(WM_PAINT, OnPaint) MESSAGE_HANDLER(WM_LBUTTONDOWN, OnLButtonDown) @@ -151,7 +150,6 @@ class PluginInstallerImpl : public CWindowImpl<PluginInstallerImpl> { // 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 @@ -375,7 +373,7 @@ class PluginInstallerImpl : public CWindowImpl<PluginInstallerImpl> { std::string activex_clsid_; CComObject<ActiveXInstaller>* activex_installer_; - DISALLOW_EVIL_CONSTRUCTORS(PluginInstallerImpl); + DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl); }; |