Index: components/exo/shell_surface.cc |
diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc |
index ffa7d00d1871efd3253c2ce536d3e88c61f3c816..0b983c2dda090c6499253e07700876efe0d3d330 100644 |
--- a/components/exo/shell_surface.cc |
+++ b/components/exo/shell_surface.cc |
@@ -933,8 +933,12 @@ void ShellSurface::OnPreWindowStateTypeChange( |
ash::wm::WindowState* window_state, |
ash::wm::WindowStateType old_type) { |
ash::wm::WindowStateType new_type = window_state->GetStateType(); |
- if (ash::wm::IsMaximizedOrFullscreenOrPinnedWindowStateType(old_type) || |
- ash::wm::IsMaximizedOrFullscreenOrPinnedWindowStateType(new_type)) { |
+ bool fromOrToMinimize = old_type == ash::wm::WINDOW_STATE_TYPE_MINIMIZED || |
reveman
2017/05/03 20:47:42
nit: "bool from_or_to_minimize" but maybe a bit cl
oshima
2017/05/03 21:33:16
Done.
|
+ new_type == ash::wm::WINDOW_STATE_TYPE_MINIMIZED; |
+ |
+ if (!fromOrToMinimize && |
+ (ash::wm::IsMaximizedOrFullscreenOrPinnedWindowStateType(old_type) || |
+ ash::wm::IsMaximizedOrFullscreenOrPinnedWindowStateType(new_type))) { |
// When transitioning in/out of maximized or fullscreen mode we need to |
// make sure we have a configure callback before we allow the default |
// cross-fade animations. The configure callback provides a mechanism for |