1 files changed, 15 insertions, 15 deletions
diff --git a/tools/memory_watcher/hotkey.h b/tools/memory_watcher/hotkey.h
index c8b1ef6..ef09e48 100644
--- a/tools/memory_watcher/hotkey.h
+++ b/tools/memory_watcher/hotkey.h
@@ -5,44 +5,44 @@
 #ifndef TOOLS_MEMORY_WATCHER_HOTKEY_H_
 #define TOOLS_MEMORY_WATCHER_HOTKEY_H_
 
-#include <atlbase.h>
-#include <atlwin.h>
+#include "base/gfx/rect.h"
+#include "base/window_impl.h"
 
 // HotKey handler.
 // Programs wishing to register a hotkey can use this.
-class HotKeyHandler : public CWindowImpl<HotKeyHandler> {
+class HotKeyHandler : public base::WindowImpl {
  public:
   HotKeyHandler(UINT modifiers, UINT vk)
-    : m_modifiers(modifiers),
-      m_vkey(vk) {
+    : modifiers_(modifiers),
+      vkey_(vk) {
     Start();
   }
   ~HotKeyHandler() { Stop(); }
 
-BEGIN_MSG_MAP(HotKeyHandler)
-  MESSAGE_HANDLER(WM_HOTKEY, OnHotKey)
-END_MSG_MAP()
+  BEGIN_MSG_MAP_EX(HotKeyHandler)
+    MESSAGE_HANDLER(WM_HOTKEY, OnHotKey)
+  END_MSG_MAP()
 
  private:
   static const int hotkey_id = 0x0000baba;
 
   bool Start() {
-    if (NULL == Create(NULL, NULL, NULL, WS_POPUP))
-      return false;
-    return RegisterHotKey(m_hWnd, hotkey_id, m_modifiers, m_vkey) == TRUE;
+    set_window_style(WS_POPUP);
+    Init(NULL, gfx::Rect());
+    return RegisterHotKey(hwnd(), hotkey_id, modifiers_, vkey_) == TRUE;
   }
 
   void Stop() {
-    UnregisterHotKey(m_hWnd, hotkey_id);
-    DestroyWindow();
+    UnregisterHotKey(hwnd(), hotkey_id);
+    DestroyWindow(hwnd());
   }
 
   // Handle the registered Hotkey being pressed.
   virtual LRESULT OnHotKey(UINT /*uMsg*/, WPARAM /*wParam*/,
                            LPARAM /*lParam*/, BOOL& bHandled) = 0;
 
-  UINT m_modifiers;
-  UINT m_vkey;
+  UINT modifiers_;
+  UINT vkey_;
 };
 
 #endif  // TOOLS_MEMORY_WATCHER_HOTKEY_H_