3 files changed, 9 insertions, 13 deletions
diff --git a/ui/base/win/foreground_helper.cc b/ui/base/win/foreground_helper.cc
index 219b26f..b4f53b6 100644
--- a/ui/base/win/foreground_helper.cc
+++ b/ui/base/win/foreground_helper.cc
@@ -72,13 +72,9 @@ HRESULT ForegroundHelper::ForegroundHotKey(HWND window) {
   return S_OK;
 }
 
-  // Handle the registered Hotkey being pressed.
-LRESULT ForegroundHelper::OnHotKey(UINT message,
-                                   WPARAM wparam,
-                                   LPARAM lparam,
-                                   BOOL& handled) {
+// Handle the registered Hotkey being pressed.
+void ForegroundHelper::OnHotKey(int id, UINT vcode, UINT modifiers) {
   SetForegroundWindow(window_);
-  return 1;
 }
 
 }  // namespace ui
diff --git a/ui/base/win/foreground_helper.h b/ui/base/win/foreground_helper.h
index 73c9f63..8387c13 100644
--- a/ui/base/win/foreground_helper.h
+++ b/ui/base/win/foreground_helper.h
@@ -22,9 +22,9 @@ class UI_BASE_EXPORT ForegroundHelper : public gfx::WindowImpl {
  public:
   ForegroundHelper() : window_(NULL) { }
 
-  BEGIN_MSG_MAP_EX(ForegroundHelper)
-    MESSAGE_HANDLER(WM_HOTKEY, OnHotKey)
-  END_MSG_MAP()
+  CR_BEGIN_MSG_MAP_EX(ForegroundHelper)
+    CR_MSG_WM_HOTKEY(OnHotKey)
+  CR_END_MSG_MAP()
 
   // Brings a window into the foreground.
   // Can be called from any window, even if the caller is not the
@@ -35,7 +35,7 @@ class UI_BASE_EXPORT ForegroundHelper : public gfx::WindowImpl {
   HRESULT ForegroundHotKey(HWND window);
 
   // Handle the registered Hotkey being pressed.
-  LRESULT OnHotKey(UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled);
+  void OnHotKey(int id, UINT vcode, UINT modifiers);
 
   HWND window_;
 
diff --git a/ui/base/win/hidden_window.cc b/ui/base/win/hidden_window.cc
index 3b21519..d04f2a3 100644
--- a/ui/base/win/hidden_window.cc
+++ b/ui/base/win/hidden_window.cc
@@ -42,9 +42,9 @@ class TempParent : public gfx::WindowImpl {
   void OnClose() {
   }
 
-  BEGIN_MSG_MAP_EX(WebContentsViewWin)
-    MSG_WM_CLOSE(OnClose)
-  END_MSG_MAP()
+  CR_BEGIN_MSG_MAP_EX(WebContentsViewWin)
+    CR_MSG_WM_CLOSE(OnClose)
+  CR_END_MSG_MAP()
 };
 
 }  // namespace