| Index: ash/wm/default_state.cc
|
| diff --git a/ash/wm/default_state.cc b/ash/wm/default_state.cc
|
| index a6ea57149d9ade6b2edae13adf4e1a92fa91d625..f35de1fd53e90a5b7713c6a1ce83ebfcf4bcb108 100644
|
| --- a/ash/wm/default_state.cc
|
| +++ b/ash/wm/default_state.cc
|
| @@ -428,8 +428,7 @@ void DefaultState::UpdateBounds(WindowState* window_state,
|
|
|
| if (state_type != WINDOW_STATE_TYPE_MINIMIZED) {
|
| if (old_state_type == WINDOW_STATE_TYPE_MINIMIZED ||
|
| - (window_state->IsFullscreen() &&
|
| - !window_state->animate_to_fullscreen())) {
|
| + window_state->IsFullscreen()) {
|
| window_state->SetBoundsDirect(bounds_in_parent);
|
| } else if (window_state->IsMaximizedOrFullscreen() ||
|
| IsMaximizedOrFullscreenWindowStateType(old_state_type)) {
|
|
|