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

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

Issue 2070143003: Add MD ink drop ripple to app list button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b612539_shelf_button_ripple
Patch Set: Rebased Created 4 years, 5 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/app_list/app_list_presenter_delegate.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
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 // The base color of the shelf to which different alpha values are applied 54 // The base color of the shelf to which different alpha values are applied
55 // based on the desired shelf opacity level. 55 // based on the desired shelf opacity level.
56 ASH_EXPORT extern const SkColor kShelfBaseColor; 56 ASH_EXPORT extern const SkColor kShelfBaseColor;
57 57
58 // Highlight color used for shelf button activated states. 58 // Highlight color used for shelf button activated states.
59 // TODO(bruthig|mohsen): Use of this color is temporary. Draw the active state 59 // TODO(bruthig|mohsen): Use of this color is temporary. Draw the active state
60 // using the material design ripple animation. 60 // using the material design ripple animation.
61 ASH_EXPORT extern const SkColor kShelfButtonActivatedHighlightColor; 61 ASH_EXPORT extern const SkColor kShelfButtonActivatedHighlightColor;
62 62
63 // Ink drop color for shelf items.
64 extern const SkColor kShelfInkDropBaseColor;
65
63 // Opacity of the ink drop ripple for shelf items when the ripple is visible. 66 // Opacity of the ink drop ripple for shelf items when the ripple is visible.
64 extern const float kShelfInkDropVisibleOpacity; 67 extern const float kShelfInkDropVisibleOpacity;
65 68
66 // The foreground color of the icons used in the shelf (launcher, 69 // The foreground color of the icons used in the shelf (launcher,
67 // notifications, etc). 70 // notifications, etc).
68 ASH_EXPORT extern const SkColor kShelfIconColor; 71 ASH_EXPORT extern const SkColor kShelfIconColor;
69 72
70 // The width and height of the material design overflow button. 73 // The width and height of the material design overflow button.
71 // TODO(tdanderson): Refactor constants which are common between the shelf 74 // TODO(tdanderson): Refactor constants which are common between the shelf
72 // and the tray. See crbug.com/623987. 75 // and the tray. See crbug.com/623987.
73 extern const int kOverflowButtonSize; 76 extern const int kOverflowButtonSize;
74 77
75 // The radius of the rounded corners of the overflow button. 78 // The radius of the rounded corners of the overflow button.
76 extern const int kOverflowButtonCornerRadius; 79 extern const int kOverflowButtonCornerRadius;
77 80
78 // The radius of the circular material design app list button. 81 // The radius of the circular material design app list button.
79 extern const int kAppListButtonRadius; 82 extern const int kAppListButtonRadius;
80 83
81 // The direction of the focus cycling. 84 // The direction of the focus cycling.
82 enum CycleDirection { CYCLE_FORWARD, CYCLE_BACKWARD }; 85 enum CycleDirection { CYCLE_FORWARD, CYCLE_BACKWARD };
83 86
84 ASH_EXPORT int GetShelfConstant(ShelfConstant shelf_constant); 87 ASH_EXPORT int GetShelfConstant(ShelfConstant shelf_constant);
85 88
86 } // namespace ash 89 } // namespace ash
87 90
88 #endif // ASH_COMMON_SHELF_SHELF_CONSTANTS_H_ 91 #endif // ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
OLDNEW
« no previous file with comments | « ash/app_list/app_list_presenter_delegate.cc ('k') | ash/common/shelf/shelf_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698