From 307d936d759decce731427c2ad03b25c49fccf67 Mon Sep 17 00:00:00 2001 From: Adam Roben Date: Fri, 27 Jun 2014 13:40:33 -0400 Subject: [PATCH] Update to use CR_* Windows message macros See https://codereview.chromium.org/146833020. --- brightray/browser/win/devtools_window.cc | 6 +++--- brightray/browser/win/devtools_window.h | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/brightray/browser/win/devtools_window.cc b/brightray/browser/win/devtools_window.cc index 9fc4b5dba886..96d0a3048475 100644 --- a/brightray/browser/win/devtools_window.cc +++ b/brightray/browser/win/devtools_window.cc @@ -20,7 +20,7 @@ DevToolsWindow::DevToolsWindow(InspectableWebContentsViewWin* controller) DevToolsWindow::~DevToolsWindow() { } -LRESULT DevToolsWindow::OnCreate(UINT, WPARAM, LPARAM, BOOL&) { +LRESULT DevToolsWindow::OnCreate(UINT, WPARAM, LPARAM) { auto devtools_web_contents = controller_->inspectable_web_contents()->devtools_web_contents(); SetParent(devtools_web_contents->GetView()->GetNativeView(), hwnd()); @@ -28,7 +28,7 @@ LRESULT DevToolsWindow::OnCreate(UINT, WPARAM, LPARAM, BOOL&) { return 0; } -LRESULT DevToolsWindow::OnDestroy(UINT, WPARAM, LPARAM, BOOL&) { +LRESULT DevToolsWindow::OnDestroy(UINT, WPARAM, LPARAM) { auto devtools_web_contents = controller_->inspectable_web_contents()->devtools_web_contents(); SetParent( @@ -37,7 +37,7 @@ LRESULT DevToolsWindow::OnDestroy(UINT, WPARAM, LPARAM, BOOL&) { return 0; } -LRESULT DevToolsWindow::OnSize(UINT, WPARAM, LPARAM, BOOL&) { +LRESULT DevToolsWindow::OnSize(UINT, WPARAM, LPARAM) { RECT rect; GetClientRect(hwnd(), &rect); diff --git a/brightray/browser/win/devtools_window.h b/brightray/browser/win/devtools_window.h index a6b11bb11e0c..a7e34d2b738c 100644 --- a/brightray/browser/win/devtools_window.h +++ b/brightray/browser/win/devtools_window.h @@ -14,20 +14,20 @@ class DevToolsWindow : public gfx::WindowImpl, static DevToolsWindow* Create( InspectableWebContentsViewWin* inspectable_web_contents_view_win); - BEGIN_MSG_MAP_EX(DevToolsWindow) - MESSAGE_HANDLER(WM_CREATE, OnCreate) - MESSAGE_HANDLER(WM_DESTROY, OnDestroy) - MESSAGE_HANDLER(WM_SIZE, OnSize) - END_MSG_MAP() + CR_BEGIN_MSG_MAP_EX(DevToolsWindow) + CR_MESSAGE_HANDLER_EX(WM_CREATE, OnCreate) + CR_MESSAGE_HANDLER_EX(WM_DESTROY, OnDestroy) + CR_MESSAGE_HANDLER_EX(WM_SIZE, OnSize) + CR_END_MSG_MAP() private: explicit DevToolsWindow( InspectableWebContentsViewWin* inspectable_web_contents_view_win); ~DevToolsWindow(); - LRESULT OnCreate(UINT message, WPARAM, LPARAM, BOOL& handled); - LRESULT OnDestroy(UINT message, WPARAM, LPARAM, BOOL& handled); - LRESULT OnSize(UINT message, WPARAM, LPARAM, BOOL& handled); + LRESULT OnCreate(UINT message, WPARAM, LPARAM); + LRESULT OnDestroy(UINT message, WPARAM, LPARAM); + LRESULT OnSize(UINT message, WPARAM, LPARAM); InspectableWebContentsViewWin* controller_;