| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/tablet_mode/tablet_mode_window_state.h" | 5 #include "ash/wm/tablet_mode/tablet_mode_window_state.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/public/cpp/shell_window_ids.h" | 9 #include "ash/public/cpp/shell_window_ids.h" |
| 10 #include "ash/screen_util.h" | 10 #include "ash/screen_util.h" |
| 11 #include "ash/shell.h" | 11 #include "ash/shell.h" |
| 12 #include "ash/wm/screen_pinning_controller.h" | 12 #include "ash/wm/screen_pinning_controller.h" |
| 13 #include "ash/wm/tablet_mode/tablet_mode_window_manager.h" | 13 #include "ash/wm/tablet_mode/tablet_mode_window_manager.h" |
| 14 #include "ash/wm/window_animation_types.h" | 14 #include "ash/wm/window_animation_types.h" |
| 15 #include "ash/wm/window_properties.h" | 15 #include "ash/wm/window_properties.h" |
| 16 #include "ash/wm/window_state_util.h" | 16 #include "ash/wm/window_state_util.h" |
| 17 #include "ash/wm/wm_event.h" | 17 #include "ash/wm/wm_event.h" |
| 18 #include "ash/wm_window.h" | |
| 19 #include "ui/aura/window.h" | 18 #include "ui/aura/window.h" |
| 20 #include "ui/aura/window_delegate.h" | 19 #include "ui/aura/window_delegate.h" |
| 21 #include "ui/compositor/layer.h" | 20 #include "ui/compositor/layer.h" |
| 22 #include "ui/gfx/geometry/rect.h" | 21 #include "ui/gfx/geometry/rect.h" |
| 23 | 22 |
| 24 namespace ash { | 23 namespace ash { |
| 25 namespace { | 24 namespace { |
| 26 | 25 |
| 27 // Sets the restore bounds and show state overrides. These values take | 26 // Sets the restore bounds and show state overrides. These values take |
| 28 // precedence over the restore bounds and restore show state (if set). | 27 // precedence over the restore bounds and restore show state (if set). |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 341 // avoid flashing. | 340 // avoid flashing. |
| 342 if (window_state->IsMaximized()) | 341 if (window_state->IsMaximized()) |
| 343 window_state->SetBoundsDirectCrossFade(bounds_in_parent); | 342 window_state->SetBoundsDirectCrossFade(bounds_in_parent); |
| 344 else | 343 else |
| 345 window_state->SetBoundsDirectAnimated(bounds_in_parent); | 344 window_state->SetBoundsDirectAnimated(bounds_in_parent); |
| 346 } | 345 } |
| 347 } | 346 } |
| 348 } | 347 } |
| 349 | 348 |
| 350 } // namespace ash | 349 } // namespace ash |
| OLD | NEW |