| 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" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 case ui::SHOW_STATE_NORMAL: | 26 case ui::SHOW_STATE_NORMAL: |
| 27 return WM_EVENT_NORMAL; | 27 return WM_EVENT_NORMAL; |
| 28 case ui::SHOW_STATE_MINIMIZED: | 28 case ui::SHOW_STATE_MINIMIZED: |
| 29 return WM_EVENT_MINIMIZE; | 29 return WM_EVENT_MINIMIZE; |
| 30 case ui::SHOW_STATE_MAXIMIZED: | 30 case ui::SHOW_STATE_MAXIMIZED: |
| 31 return WM_EVENT_MAXIMIZE; | 31 return WM_EVENT_MAXIMIZE; |
| 32 case ui::SHOW_STATE_FULLSCREEN: | 32 case ui::SHOW_STATE_FULLSCREEN: |
| 33 return WM_EVENT_FULLSCREEN; | 33 return WM_EVENT_FULLSCREEN; |
| 34 case ui::SHOW_STATE_INACTIVE: | 34 case ui::SHOW_STATE_INACTIVE: |
| 35 return WM_EVENT_SHOW_INACTIVE; | 35 return WM_EVENT_SHOW_INACTIVE; |
| 36 |
| 37 // TODO(afakhry): Remove Docked Windows in M58. |
| 36 case ui::SHOW_STATE_DOCKED: | 38 case ui::SHOW_STATE_DOCKED: |
| 37 return WM_EVENT_DOCK; | 39 return WM_EVENT_DOCK; |
| 38 case ui::SHOW_STATE_END: | 40 case ui::SHOW_STATE_END: |
| 39 NOTREACHED() << "No WMEvent defined for the show state:" | 41 NOTREACHED() << "No WMEvent defined for the show state:" |
| 40 << requested_show_state; | 42 << requested_show_state; |
| 41 } | 43 } |
| 42 return WM_EVENT_NORMAL; | 44 return WM_EVENT_NORMAL; |
| 43 } | 45 } |
| 44 | 46 |
| 45 } // namespace | 47 } // namespace |
| (...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 if (!window_->GetTargetVisibility()) { | 392 if (!window_->GetTargetVisibility()) { |
| 391 SetBoundsConstrained(new_bounds); | 393 SetBoundsConstrained(new_bounds); |
| 392 return; | 394 return; |
| 393 } | 395 } |
| 394 | 396 |
| 395 window_->SetBoundsDirectCrossFade(new_bounds); | 397 window_->SetBoundsDirectCrossFade(new_bounds); |
| 396 } | 398 } |
| 397 | 399 |
| 398 } // namespace wm | 400 } // namespace wm |
| 399 } // namespace ash | 401 } // namespace ash |
| OLD | NEW |