Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(607)

Side by Side Diff: ash/common/wm/wm_types.cc

Issue 2625113004: Unify window fullscreen and minimizing implementation (Closed)
Patch Set: Update Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 22 matching lines...) Expand all
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 case WINDOW_STATE_TYPE_TRUSTED_PINNED:
42 return ui::SHOW_STATE_FULLSCREEN; 42 return ui::SHOW_STATE_FULLSCREEN;
43 case WINDOW_STATE_TYPE_PREVIOUS:
44 return ui::SHOW_STATE_PREVIOUS;
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
OLDNEW
« no previous file with comments | « ash/common/wm/wm_types.h ('k') | ash/common/wm_window.cc » ('j') | ui/base/ui_base_types.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698