Chromium Code Reviews| Index: ui/views/win/hwnd_message_handler.cc |
| diff --git a/ui/views/win/hwnd_message_handler.cc b/ui/views/win/hwnd_message_handler.cc |
| index f632827ca29663e93365929d151c4c1c5add9d49..946a3d9c1d3af4eb2ebfc126eb00cdb8670d3caa 100644 |
| --- a/ui/views/win/hwnd_message_handler.cc |
| +++ b/ui/views/win/hwnd_message_handler.cc |
| @@ -929,7 +929,8 @@ LRESULT HWNDMessageHandler::OnWndProc(UINT message, |
| } |
| if (message == WM_ACTIVATE && IsTopLevelWindow(window)) |
|
sky
2016/02/18 17:18:47
nit: add {} now
|
| - PostProcessActivateMessage(LOWORD(w_param), !!HIWORD(w_param)); |
| + PostProcessActivateMessage(LOWORD(w_param), !!HIWORD(w_param), |
| + reinterpret_cast<HWND>(l_param)); |
| return result; |
| } |
| @@ -1027,12 +1028,16 @@ void HWNDMessageHandler::SetInitialFocus() { |
| } |
| } |
| -void HWNDMessageHandler::PostProcessActivateMessage(int activation_state, |
| - bool minimized) { |
| +void HWNDMessageHandler::PostProcessActivateMessage( |
| + int activation_state, |
| + bool minimized, |
| + HWND window_gaining_or_losing_activation) { |
| DCHECK(IsTopLevelWindow(hwnd())); |
| const bool active = activation_state != WA_INACTIVE && !minimized; |
| - if (delegate_->CanActivate()) |
| - delegate_->HandleActivationChanged(active); |
| + if (delegate_->CanActivate()) { |
| + delegate_->HandleActivationChanged(active, |
| + window_gaining_or_losing_activation); |
| + } |
| } |
| void HWNDMessageHandler::RestoreEnabledIfNecessary() { |