Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(45)

Unified Diff: webkit/default_plugin/plugin_impl_win.h

Issue 164543: Reverting 23406. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/default_plugin/default_plugin.gyp ('k') | webkit/default_plugin/plugin_impl_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/default_plugin/plugin_impl_win.h
===================================================================
--- webkit/default_plugin/plugin_impl_win.h (revision 23410)
+++ webkit/default_plugin/plugin_impl_win.h (working copy)
@@ -5,10 +5,11 @@
#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"
@@ -35,7 +36,7 @@
// 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;
@@ -46,7 +47,7 @@
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)
@@ -150,6 +151,7 @@
// 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
@@ -373,7 +375,7 @@
std::string activex_clsid_;
CComObject<ActiveXInstaller>* activex_installer_;
- DISALLOW_COPY_AND_ASSIGN(PluginInstallerImpl);
+ DISALLOW_EVIL_CONSTRUCTORS(PluginInstallerImpl);
};
« no previous file with comments | « webkit/default_plugin/default_plugin.gyp ('k') | webkit/default_plugin/plugin_impl_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698