| 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/wm_types.h" | 5 #include "ash/common/wm/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"); |
| 16 | 16 |
| 17 WindowStateType ToWindowStateType(ui::WindowShowState state) { | 17 WindowStateType ToWindowStateType(ui::WindowShowState state) { |
| 18 return static_cast<WindowStateType>(state); | 18 return static_cast<WindowStateType>(state); |
| 19 } | 19 } |
| 20 | 20 |
| 21 ui::WindowShowState ToWindowShowState(WindowStateType type) { | 21 ui::WindowShowState ToWindowShowState(WindowStateType type) { |
| 22 switch (type) { | 22 switch (type) { |
| 23 case WINDOW_STATE_TYPE_DEFAULT: | 23 case WINDOW_STATE_TYPE_DEFAULT: |
| 24 return ui::SHOW_STATE_DEFAULT; | 24 return ui::SHOW_STATE_DEFAULT; |
| 25 case WINDOW_STATE_TYPE_NORMAL: | 25 case WINDOW_STATE_TYPE_NORMAL: |
| 26 case WINDOW_STATE_TYPE_RIGHT_SNAPPED: | 26 case WINDOW_STATE_TYPE_RIGHT_SNAPPED: |
| 27 case WINDOW_STATE_TYPE_LEFT_SNAPPED: | 27 case WINDOW_STATE_TYPE_LEFT_SNAPPED: |
| 28 case WINDOW_STATE_TYPE_AUTO_POSITIONED: | 28 case WINDOW_STATE_TYPE_AUTO_POSITIONED: |
| 29 return ui::SHOW_STATE_NORMAL; | 29 return ui::SHOW_STATE_NORMAL; |
| 30 |
| 31 // TODO(afakhry): Remove Docked Windows in M58. |
| 30 case WINDOW_STATE_TYPE_DOCKED: | 32 case WINDOW_STATE_TYPE_DOCKED: |
| 31 return ui::SHOW_STATE_DOCKED; | 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: | 35 case WINDOW_STATE_TYPE_DOCKED_MINIMIZED: |
| 34 return ui::SHOW_STATE_MINIMIZED; | 36 return ui::SHOW_STATE_MINIMIZED; |
| 35 case WINDOW_STATE_TYPE_MAXIMIZED: | 37 case WINDOW_STATE_TYPE_MAXIMIZED: |
| 36 return ui::SHOW_STATE_MAXIMIZED; | 38 return ui::SHOW_STATE_MAXIMIZED; |
| 37 case WINDOW_STATE_TYPE_INACTIVE: | 39 case WINDOW_STATE_TYPE_INACTIVE: |
| 38 return ui::SHOW_STATE_INACTIVE; | 40 return ui::SHOW_STATE_INACTIVE; |
| 39 case WINDOW_STATE_TYPE_FULLSCREEN: | 41 case WINDOW_STATE_TYPE_FULLSCREEN: |
| 40 case WINDOW_STATE_TYPE_PINNED: | 42 case WINDOW_STATE_TYPE_PINNED: |
| 41 case WINDOW_STATE_TYPE_TRUSTED_PINNED: | 43 case WINDOW_STATE_TYPE_TRUSTED_PINNED: |
| 42 return ui::SHOW_STATE_FULLSCREEN; | 44 return ui::SHOW_STATE_FULLSCREEN; |
| 43 case WINDOW_STATE_TYPE_END: | 45 case WINDOW_STATE_TYPE_END: |
| 44 NOTREACHED(); | 46 NOTREACHED(); |
| 45 } | 47 } |
| 46 NOTREACHED(); | 48 NOTREACHED(); |
| 47 return ui::SHOW_STATE_DEFAULT; | 49 return ui::SHOW_STATE_DEFAULT; |
| 48 } | 50 } |
| 49 | 51 |
| 50 bool IsMaximizedOrFullscreenOrPinnedWindowStateType(WindowStateType type) { | 52 bool IsMaximizedOrFullscreenOrPinnedWindowStateType(WindowStateType type) { |
| 51 return type == WINDOW_STATE_TYPE_MAXIMIZED || | 53 return type == WINDOW_STATE_TYPE_MAXIMIZED || |
| 52 type == WINDOW_STATE_TYPE_FULLSCREEN || | 54 type == WINDOW_STATE_TYPE_FULLSCREEN || |
| 53 type == WINDOW_STATE_TYPE_PINNED || | 55 type == WINDOW_STATE_TYPE_PINNED || |
| 54 type == WINDOW_STATE_TYPE_TRUSTED_PINNED; | 56 type == WINDOW_STATE_TYPE_TRUSTED_PINNED; |
| 55 } | 57 } |
| 56 | 58 |
| 57 } // namespace wm | 59 } // namespace wm |
| 58 } // namespace ash | 60 } // namespace ash |
| OLD | NEW |