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

Side by Side Diff: ash/common/shelf/shelf_types.h

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 4 years, 6 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/common/shelf/shelf_constants.cc ('k') | ash/common/shelf/wm_shelf.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef ASH_SHELF_SHELF_TYPES_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_TYPES_H_
6 #define ASH_SHELF_SHELF_TYPES_H_ 6 #define ASH_COMMON_SHELF_SHELF_TYPES_H_
7 7
8 // TODO(sky): make callers explicitly include this. 8 // TODO(sky): make callers explicitly include this.
9 #include "ash/common/wm/shelf/wm_shelf_types.h" 9 #include "ash/common/wm/shelf/wm_shelf_types.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 enum ShelfAutoHideBehavior { 13 enum ShelfAutoHideBehavior {
14 // Always auto-hide. 14 // Always auto-hide.
15 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS, 15 SHELF_AUTO_HIDE_BEHAVIOR_ALWAYS,
16 16
17 // Never auto-hide. 17 // Never auto-hide.
18 SHELF_AUTO_HIDE_BEHAVIOR_NEVER, 18 SHELF_AUTO_HIDE_BEHAVIOR_NEVER,
19 19
20 // Always hide. 20 // Always hide.
21 SHELF_AUTO_HIDE_ALWAYS_HIDDEN, 21 SHELF_AUTO_HIDE_ALWAYS_HIDDEN,
22 }; 22 };
23 23
24 enum ShelfAutoHideState { 24 enum ShelfAutoHideState {
25 SHELF_AUTO_HIDE_SHOWN, 25 SHELF_AUTO_HIDE_SHOWN,
26 SHELF_AUTO_HIDE_HIDDEN, 26 SHELF_AUTO_HIDE_HIDDEN,
27 }; 27 };
28 28
29 enum ShelfVisibilityState {
30 // Always visible.
31 SHELF_VISIBLE,
32
33 // A couple of pixels are reserved at the bottom for the shelf.
34 SHELF_AUTO_HIDE,
35
36 // Nothing is shown. Used for fullscreen windows.
37 SHELF_HIDDEN,
38 };
39
29 } // namespace ash 40 } // namespace ash
30 41
31 #endif // ASH_SHELF_SHELF_TYPES_H_ 42 #endif // ASH_COMMON_SHELF_SHELF_TYPES_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_constants.cc ('k') | ash/common/shelf/wm_shelf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698