OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/common/wm/window_state.h" | 5 #include "ash/common/wm/window_state.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "ash/common/wm/default_state.h" | 9 #include "ash/common/wm/default_state.h" |
10 #include "ash/common/wm/window_positioning_utils.h" | 10 #include "ash/common/wm/window_positioning_utils.h" |
11 #include "ash/common/wm/window_state_delegate.h" | 11 #include "ash/common/wm/window_state_delegate.h" |
12 #include "ash/common/wm/window_state_observer.h" | 12 #include "ash/common/wm/window_state_observer.h" |
13 #include "ash/common/wm/wm_event.h" | 13 #include "ash/common/wm/wm_event.h" |
14 #include "ash/common/wm/wm_screen_util.h" | 14 #include "ash/common/wm/wm_screen_util.h" |
15 #include "ash/common/wm/wm_window.h" | 15 #include "ash/common/wm_window.h" |
16 #include "base/auto_reset.h" | 16 #include "base/auto_reset.h" |
17 | 17 |
18 namespace ash { | 18 namespace ash { |
19 namespace wm { | 19 namespace wm { |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) { | 23 WMEventType WMEventTypeFromShowState(ui::WindowShowState requested_show_state) { |
24 switch (requested_show_state) { | 24 switch (requested_show_state) { |
25 case ui::SHOW_STATE_DEFAULT: | 25 case ui::SHOW_STATE_DEFAULT: |
(...skipping 358 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
384 if (!window_->GetTargetVisibility()) { | 384 if (!window_->GetTargetVisibility()) { |
385 SetBoundsConstrained(new_bounds); | 385 SetBoundsConstrained(new_bounds); |
386 return; | 386 return; |
387 } | 387 } |
388 | 388 |
389 window_->SetBoundsDirectCrossFade(new_bounds); | 389 window_->SetBoundsDirectCrossFade(new_bounds); |
390 } | 390 } |
391 | 391 |
392 } // namespace wm | 392 } // namespace wm |
393 } // namespace ash | 393 } // namespace ash |
OLD | NEW |