| 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 { |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 return ui::SHOW_STATE_DOCKED; | 31 return ui::SHOW_STATE_DOCKED; |
| 32 case WINDOW_STATE_TYPE_MINIMIZED: | 32 case WINDOW_STATE_TYPE_MINIMIZED: |
| 33 case WINDOW_STATE_TYPE_DOCKED_MINIMIZED: | 33 case WINDOW_STATE_TYPE_DOCKED_MINIMIZED: |
| 34 return ui::SHOW_STATE_MINIMIZED; | 34 return ui::SHOW_STATE_MINIMIZED; |
| 35 case WINDOW_STATE_TYPE_MAXIMIZED: | 35 case WINDOW_STATE_TYPE_MAXIMIZED: |
| 36 return ui::SHOW_STATE_MAXIMIZED; | 36 return ui::SHOW_STATE_MAXIMIZED; |
| 37 case WINDOW_STATE_TYPE_INACTIVE: | 37 case WINDOW_STATE_TYPE_INACTIVE: |
| 38 return ui::SHOW_STATE_INACTIVE; | 38 return ui::SHOW_STATE_INACTIVE; |
| 39 case WINDOW_STATE_TYPE_FULLSCREEN: | 39 case WINDOW_STATE_TYPE_FULLSCREEN: |
| 40 case WINDOW_STATE_TYPE_PINNED: | 40 case WINDOW_STATE_TYPE_PINNED: |
| 41 case WINDOW_STATE_TYPE_TRUSTED_PINNED: |
| 41 return ui::SHOW_STATE_FULLSCREEN; | 42 return ui::SHOW_STATE_FULLSCREEN; |
| 42 case WINDOW_STATE_TYPE_END: | 43 case WINDOW_STATE_TYPE_END: |
| 43 NOTREACHED(); | 44 NOTREACHED(); |
| 44 } | 45 } |
| 45 NOTREACHED(); | 46 NOTREACHED(); |
| 46 return ui::SHOW_STATE_DEFAULT; | 47 return ui::SHOW_STATE_DEFAULT; |
| 47 } | 48 } |
| 48 | 49 |
| 49 bool IsMaximizedOrFullscreenOrPinnedWindowStateType(WindowStateType type) { | 50 bool IsMaximizedOrFullscreenOrPinnedWindowStateType(WindowStateType type) { |
| 50 return type == WINDOW_STATE_TYPE_MAXIMIZED || | 51 return type == WINDOW_STATE_TYPE_MAXIMIZED || |
| 51 type == WINDOW_STATE_TYPE_FULLSCREEN || | 52 type == WINDOW_STATE_TYPE_FULLSCREEN || |
| 52 type == WINDOW_STATE_TYPE_PINNED; | 53 type == WINDOW_STATE_TYPE_PINNED || |
| 54 type == WINDOW_STATE_TYPE_TRUSTED_PINNED; |
| 53 } | 55 } |
| 54 | 56 |
| 55 } // namespace wm | 57 } // namespace wm |
| 56 } // namespace ash | 58 } // namespace ash |
| OLD | NEW |