| 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/wm/wm_types.h" | 5 #include "ash/wm/common/wm_types.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 | 8 |
| 9 namespace ash { | 9 namespace ash { |
| 10 namespace wm { | 10 namespace wm { |
| 11 | 11 |
| 12 // This is to catch the change to WindowShowState. | 12 // This is to catch the change to WindowShowState. |
| 13 static_assert(ui::SHOW_STATE_END == | 13 static_assert(ui::SHOW_STATE_END == |
| 14 static_cast<ui::WindowShowState>(WINDOW_STATE_TYPE_END), | 14 static_cast<ui::WindowShowState>(WINDOW_STATE_TYPE_END), |
| 15 "show enum mismatch"); | 15 "show enum mismatch"); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 40 return ui::SHOW_STATE_FULLSCREEN; | 40 return ui::SHOW_STATE_FULLSCREEN; |
| 41 case WINDOW_STATE_TYPE_END: | 41 case WINDOW_STATE_TYPE_END: |
| 42 NOTREACHED(); | 42 NOTREACHED(); |
| 43 } | 43 } |
| 44 NOTREACHED(); | 44 NOTREACHED(); |
| 45 return ui::SHOW_STATE_DEFAULT; | 45 return ui::SHOW_STATE_DEFAULT; |
| 46 } | 46 } |
| 47 | 47 |
| 48 bool IsMaximizedOrFullscreenWindowStateType(WindowStateType type) { | 48 bool IsMaximizedOrFullscreenWindowStateType(WindowStateType type) { |
| 49 return type == WINDOW_STATE_TYPE_MAXIMIZED || | 49 return type == WINDOW_STATE_TYPE_MAXIMIZED || |
| 50 type == WINDOW_STATE_TYPE_FULLSCREEN; | 50 type == WINDOW_STATE_TYPE_FULLSCREEN; |
| 51 } | 51 } |
| 52 | 52 |
| 53 } // namespace wm | 53 } // namespace wm |
| 54 } // namespace ash | 54 } // namespace ash |
| OLD | NEW |