| 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 810b9cb02018c7813b8ee5ad342c21d75791858b..ac7645344f2e60f7ce4fe9484df2342fe752e60c 100644
|
| --- a/ui/views/win/hwnd_message_handler.cc
|
| +++ b/ui/views/win/hwnd_message_handler.cc
|
| @@ -827,10 +827,6 @@ void HWNDMessageHandler::SetWindowIcons(const gfx::ImageSkia& window_icon,
|
| void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
|
| background_fullscreen_hack_ = false;
|
| fullscreen_handler()->SetFullscreen(fullscreen);
|
| - // If we are out of fullscreen and there was a pending DWM transition for the
|
| - // window, then go ahead and do it now.
|
| - if (!fullscreen && dwm_transition_desired_)
|
| - PerformDwmTransition();
|
|
|
| // Add the fullscreen window to the fullscreen window map which is used to
|
| // handle window activations.
|
| @@ -843,6 +839,10 @@ void HWNDMessageHandler::SetFullscreen(bool fullscreen) {
|
| if (iter != fullscreen_monitor_map_.Get().end())
|
| fullscreen_monitor_map_.Get().erase(iter);
|
| }
|
| + // If we are out of fullscreen and there was a pending DWM transition for the
|
| + // window, then go ahead and do it now.
|
| + if (!fullscreen && dwm_transition_desired_)
|
| + PerformDwmTransition();
|
| }
|
|
|
| void HWNDMessageHandler::SizeConstraintsChanged() {
|
|
|