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

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

Issue 597683003: Add window states docked; and docked minimized. Add wm window event to set docked and undocked. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dock
Patch Set: Pull forward a change from the dependant CL to this Created 6 years, 2 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
« no previous file with comments | « ash/wm/wm_types.h ('k') | ash/wm/workspace/workspace_window_resizer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/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 {
(...skipping 10 matching lines...) Expand all
21 } 21 }
22 22
23 ui::WindowShowState ToWindowShowState(WindowStateType type) { 23 ui::WindowShowState ToWindowShowState(WindowStateType type) {
24 switch (type) { 24 switch (type) {
25 case WINDOW_STATE_TYPE_DEFAULT: 25 case WINDOW_STATE_TYPE_DEFAULT:
26 return ui::SHOW_STATE_DEFAULT; 26 return ui::SHOW_STATE_DEFAULT;
27 case WINDOW_STATE_TYPE_NORMAL: 27 case WINDOW_STATE_TYPE_NORMAL:
28 case WINDOW_STATE_TYPE_RIGHT_SNAPPED: 28 case WINDOW_STATE_TYPE_RIGHT_SNAPPED:
29 case WINDOW_STATE_TYPE_LEFT_SNAPPED: 29 case WINDOW_STATE_TYPE_LEFT_SNAPPED:
30 case WINDOW_STATE_TYPE_AUTO_POSITIONED: 30 case WINDOW_STATE_TYPE_AUTO_POSITIONED:
31 case WINDOW_STATE_TYPE_DOCKED:
31 return ui::SHOW_STATE_NORMAL; 32 return ui::SHOW_STATE_NORMAL;
32 case WINDOW_STATE_TYPE_MINIMIZED: 33 case WINDOW_STATE_TYPE_MINIMIZED:
34 case WINDOW_STATE_TYPE_DOCKED_MINIMIZED:
33 return ui::SHOW_STATE_MINIMIZED; 35 return ui::SHOW_STATE_MINIMIZED;
34 case WINDOW_STATE_TYPE_MAXIMIZED: 36 case WINDOW_STATE_TYPE_MAXIMIZED:
35 return ui::SHOW_STATE_MAXIMIZED; 37 return ui::SHOW_STATE_MAXIMIZED;
36 case WINDOW_STATE_TYPE_INACTIVE: 38 case WINDOW_STATE_TYPE_INACTIVE:
37 return ui::SHOW_STATE_INACTIVE; 39 return ui::SHOW_STATE_INACTIVE;
38 case WINDOW_STATE_TYPE_FULLSCREEN: 40 case WINDOW_STATE_TYPE_FULLSCREEN:
39 return ui::SHOW_STATE_FULLSCREEN; 41 return ui::SHOW_STATE_FULLSCREEN;
40 case WINDOW_STATE_TYPE_END: 42 case WINDOW_STATE_TYPE_END:
41 NOTREACHED(); 43 NOTREACHED();
42 } 44 }
43 NOTREACHED(); 45 NOTREACHED();
44 return ui::SHOW_STATE_DEFAULT; 46 return ui::SHOW_STATE_DEFAULT;
45 } 47 }
46 48
47 bool IsMaximizedOrFullscreenWindowStateType(WindowStateType type) { 49 bool IsMaximizedOrFullscreenWindowStateType(WindowStateType type) {
48 return type == WINDOW_STATE_TYPE_MAXIMIZED || 50 return type == WINDOW_STATE_TYPE_MAXIMIZED ||
49 type == WINDOW_STATE_TYPE_FULLSCREEN; 51 type == WINDOW_STATE_TYPE_FULLSCREEN;
50 } 52 }
51 53
52 } // namespace wm 54 } // namespace wm
53 } // namespace ash 55 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/wm_types.h ('k') | ash/wm/workspace/workspace_window_resizer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698