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/wm_types.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 | 9 |
10 namespace ash { | 10 namespace ash { |
11 namespace wm { | 11 namespace wm { |
12 | 12 |
13 // This is to catch the change to WindowShowState. | 13 // This is to catch the change to WindowShowState. |
14 static_assert(ui::SHOW_STATE_END == | 14 static_assert(ui::SHOW_STATE_END == |
15 static_cast<ui::WindowShowState>(WINDOW_STATE_TYPE_END), | 15 static_cast<ui::WindowShowState>(WINDOW_STATE_TYPE_END), |
16 "show enum mismatch"); | 16 "show enum mismatch"); |
17 | 17 |
18 WindowStateType ToWindowStateType(ui::WindowShowState state) { | 18 WindowStateType ToWindowStateType(ui::WindowShowState state) { |
19 return static_cast<WindowStateType>(state); | 19 return static_cast<WindowStateType>(state); |
20 } | 20 } |
21 | 21 |
22 ui::WindowShowState ToWindowShowState(WindowStateType type) { | 22 ui::WindowShowState ToWindowShowState(WindowStateType type) { |
23 switch (type) { | 23 switch (type) { |
24 case WINDOW_STATE_TYPE_DEFAULT: | 24 case WINDOW_STATE_TYPE_DEFAULT: |
25 return ui::SHOW_STATE_DEFAULT; | 25 return ui::SHOW_STATE_DEFAULT; |
26 case WINDOW_STATE_TYPE_NORMAL: | 26 case WINDOW_STATE_TYPE_NORMAL: |
27 case WINDOW_STATE_TYPE_RIGHT_SNAPPED: | 27 case WINDOW_STATE_TYPE_RIGHT_SNAPPED: |
28 case WINDOW_STATE_TYPE_LEFT_SNAPPED: | 28 case WINDOW_STATE_TYPE_LEFT_SNAPPED: |
29 case WINDOW_STATE_TYPE_AUTO_POSITIONED: | 29 case WINDOW_STATE_TYPE_AUTO_POSITIONED: |
| 30 return ui::SHOW_STATE_NORMAL; |
30 case WINDOW_STATE_TYPE_DOCKED: | 31 case WINDOW_STATE_TYPE_DOCKED: |
31 return ui::SHOW_STATE_NORMAL; | 32 case WINDOW_STATE_TYPE_DOCKED_MINIMIZED: |
| 33 return ui::SHOW_STATE_DOCKED; |
32 case WINDOW_STATE_TYPE_MINIMIZED: | 34 case WINDOW_STATE_TYPE_MINIMIZED: |
33 case WINDOW_STATE_TYPE_DOCKED_MINIMIZED: | |
34 return ui::SHOW_STATE_MINIMIZED; | 35 return ui::SHOW_STATE_MINIMIZED; |
35 case WINDOW_STATE_TYPE_MAXIMIZED: | 36 case WINDOW_STATE_TYPE_MAXIMIZED: |
36 return ui::SHOW_STATE_MAXIMIZED; | 37 return ui::SHOW_STATE_MAXIMIZED; |
37 case WINDOW_STATE_TYPE_INACTIVE: | 38 case WINDOW_STATE_TYPE_INACTIVE: |
38 return ui::SHOW_STATE_INACTIVE; | 39 return ui::SHOW_STATE_INACTIVE; |
39 case WINDOW_STATE_TYPE_FULLSCREEN: | 40 case WINDOW_STATE_TYPE_FULLSCREEN: |
40 return ui::SHOW_STATE_FULLSCREEN; | 41 return ui::SHOW_STATE_FULLSCREEN; |
41 case WINDOW_STATE_TYPE_END: | 42 case WINDOW_STATE_TYPE_END: |
42 NOTREACHED(); | 43 NOTREACHED(); |
43 } | 44 } |
44 NOTREACHED(); | 45 NOTREACHED(); |
45 return ui::SHOW_STATE_DEFAULT; | 46 return ui::SHOW_STATE_DEFAULT; |
46 } | 47 } |
47 | 48 |
48 bool IsMaximizedOrFullscreenWindowStateType(WindowStateType type) { | 49 bool IsMaximizedOrFullscreenWindowStateType(WindowStateType type) { |
49 return type == WINDOW_STATE_TYPE_MAXIMIZED || | 50 return type == WINDOW_STATE_TYPE_MAXIMIZED || |
50 type == WINDOW_STATE_TYPE_FULLSCREEN; | 51 type == WINDOW_STATE_TYPE_FULLSCREEN; |
51 } | 52 } |
52 | 53 |
53 } // namespace wm | 54 } // namespace wm |
54 } // namespace ash | 55 } // namespace ash |
OLD | NEW |