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

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

Issue 2712293002: Remove non-MD code from ShelfButton (Closed)
Patch Set: Rebased Created 3 years, 9 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_button.cc ('k') | ash/common/shelf/shelf_constants.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 #ifndef ASH_COMMON_SHELF_SHELF_CONSTANTS_H_ 5 #ifndef ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
6 #define ASH_COMMON_SHELF_SHELF_CONSTANTS_H_ 6 #define ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "third_party/skia/include/core/SkColor.h" 9 #include "third_party/skia/include/core/SkColor.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 enum ShelfConstant { 13 enum ShelfConstant {
14 // Size of the shelf when visible (height when the shelf is horizontal and 14 // Size of the shelf when visible (height when the shelf is horizontal and
15 // width when the shelf is vertical). 15 // width when the shelf is vertical).
16 SHELF_SIZE, 16 SHELF_SIZE,
17 17
18 // Size of the space between buttons on the shelf.
19 SHELF_BUTTON_SPACING,
20
21 // Size allocated for each app button on the shelf.
22 SHELF_BUTTON_SIZE,
23
24 // Insets allocated for shelf when it is auto hidden. 18 // Insets allocated for shelf when it is auto hidden.
25 SHELF_INSETS_FOR_AUTO_HIDE 19 SHELF_INSETS_FOR_AUTO_HIDE
26 }; 20 };
27 21
28 // We reserve a small area on the edge of the workspace area to ensure that 22 // We reserve a small area on the edge of the workspace area to ensure that
29 // the resize handle at the edge of the window can be hit. 23 // the resize handle at the edge of the window can be hit.
30 extern const int kWorkspaceAreaVisibleInset; 24 extern const int kWorkspaceAreaVisibleInset;
31 25
32 // When autohidden we extend the touch hit target onto the screen so that the 26 // When autohidden we extend the touch hit target onto the screen so that the
33 // user can drag the shelf out. 27 // user can drag the shelf out.
34 extern const int kWorkspaceAreaAutoHideInset; 28 extern const int kWorkspaceAreaAutoHideInset;
35 29
36 // Size of the shelf when auto-hidden. 30 // Size of the shelf when auto-hidden.
37 ASH_EXPORT extern const int kShelfAutoHideSize; 31 ASH_EXPORT extern const int kShelfAutoHideSize;
38 32
39 // Inset between the inner edge of the shelf (towards centre of screen), and 33 // Inset between the inner edge of the shelf (towards centre of screen), and
40 // the shelf items, notifications, status area etc. 34 // the shelf items, notifications, status area etc.
41 extern const int kShelfItemInset; 35 extern const int kShelfItemInset;
42 36
43 // Animation duration for switching black shelf and dock background on and off. 37 // Animation duration for switching black shelf and dock background on and off.
44 ASH_EXPORT extern const int kTimeToSwitchBackgroundMs; 38 ASH_EXPORT extern const int kTimeToSwitchBackgroundMs;
45 39
46 // The default base color of the shelf to which different alpha values are 40 // The default base color of the shelf to which different alpha values are
47 // applied based on the desired shelf opacity level. 41 // applied based on the desired shelf opacity level.
48 ASH_EXPORT extern const SkColor kShelfDefaultBaseColor; 42 ASH_EXPORT extern const SkColor kShelfDefaultBaseColor;
49 43
44 // Size allocated for each app button on the shelf.
45 ASH_EXPORT extern const int kShelfButtonSize;
46
47 // Size of the space between buttons on the shelf.
48 ASH_EXPORT extern const int kShelfButtonSpacing;
49
50 // Highlight color used for shelf button activated states. 50 // Highlight color used for shelf button activated states.
51 // TODO(bruthig|mohsen): Use of this color is temporary. Draw the active state 51 // TODO(bruthig|mohsen): Use of this color is temporary. Draw the active state
52 // using the material design ripple animation. 52 // using the material design ripple animation.
53 ASH_EXPORT extern const SkColor kShelfButtonActivatedHighlightColor; 53 ASH_EXPORT extern const SkColor kShelfButtonActivatedHighlightColor;
54 54
55 // Ink drop color for shelf items. 55 // Ink drop color for shelf items.
56 extern const SkColor kShelfInkDropBaseColor; 56 extern const SkColor kShelfInkDropBaseColor;
57 57
58 // Opacity of the ink drop ripple for shelf items when the ripple is visible. 58 // Opacity of the ink drop ripple for shelf items when the ripple is visible.
59 extern const float kShelfInkDropVisibleOpacity; 59 extern const float kShelfInkDropVisibleOpacity;
(...skipping 17 matching lines...) Expand all
77 extern const int kAppListButtonRadius; 77 extern const int kAppListButtonRadius;
78 78
79 // The direction of the focus cycling. 79 // The direction of the focus cycling.
80 enum CycleDirection { CYCLE_FORWARD, CYCLE_BACKWARD }; 80 enum CycleDirection { CYCLE_FORWARD, CYCLE_BACKWARD };
81 81
82 ASH_EXPORT int GetShelfConstant(ShelfConstant shelf_constant); 82 ASH_EXPORT int GetShelfConstant(ShelfConstant shelf_constant);
83 83
84 } // namespace ash 84 } // namespace ash
85 85
86 #endif // ASH_COMMON_SHELF_SHELF_CONSTANTS_H_ 86 #endif // ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_button.cc ('k') | ash/common/shelf/shelf_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698