| Index: components/exo/shell_surface.cc
|
| diff --git a/components/exo/shell_surface.cc b/components/exo/shell_surface.cc
|
| index ffa7d00d1871efd3253c2ce536d3e88c61f3c816..a3da0c3e086315b33e6d6ec7a164f2ae030427f8 100644
|
| --- a/components/exo/shell_surface.cc
|
| +++ b/components/exo/shell_surface.cc
|
| @@ -933,6 +933,11 @@ void ShellSurface::OnPreWindowStateTypeChange(
|
| ash::wm::WindowState* window_state,
|
| ash::wm::WindowStateType old_type) {
|
| ash::wm::WindowStateType new_type = window_state->GetStateType();
|
| + if (old_type == ash::wm::WINDOW_STATE_TYPE_MINIMIZED ||
|
| + new_type == ash::wm::WINDOW_STATE_TYPE_MINIMIZED) {
|
| + return;
|
| + }
|
| +
|
| if (ash::wm::IsMaximizedOrFullscreenOrPinnedWindowStateType(old_type) ||
|
| ash::wm::IsMaximizedOrFullscreenOrPinnedWindowStateType(new_type)) {
|
| // When transitioning in/out of maximized or fullscreen mode we need to
|
| @@ -940,7 +945,6 @@ void ShellSurface::OnPreWindowStateTypeChange(
|
| // cross-fade animations. The configure callback provides a mechanism for
|
| // the client to inform us that a frame has taken the state change into
|
| // account and without this cross-fade animations are unreliable.
|
| -
|
| // TODO(domlaskowski): For BoundsMode::CLIENT, the configure callback does
|
| // not yet support window state changes. See crbug.com/699746.
|
| if (configure_callback_.is_null() || bounds_mode_ == BoundsMode::CLIENT)
|
|
|