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

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

Issue 2664113004: Reland: mash: Fix MusPropertyMirrorAsh for owned properties; add test. (Closed)
Patch Set: Sync and rebase. Created 3 years, 10 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/mus_property_mirror_ash_unittest.cc ('k') | ash/common/shelf/shelf_item_types.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 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 25 matching lines...) Expand all
36 // user can drag the shelf out. 36 // user can drag the shelf out.
37 extern const int kWorkspaceAreaAutoHideInset; 37 extern const int kWorkspaceAreaAutoHideInset;
38 38
39 // Size of the shelf when auto-hidden. 39 // Size of the shelf when auto-hidden.
40 ASH_EXPORT extern const int kShelfAutoHideSize; 40 ASH_EXPORT extern const int kShelfAutoHideSize;
41 41
42 // Inset between the inner edge of the shelf (towards centre of screen), and 42 // Inset between the inner edge of the shelf (towards centre of screen), and
43 // the shelf items, notifications, status area etc. 43 // the shelf items, notifications, status area etc.
44 extern const int kShelfItemInset; 44 extern const int kShelfItemInset;
45 45
46 const int kInvalidShelfID = 0;
47
48 // Animation duration for switching black shelf and dock background on and off. 46 // Animation duration for switching black shelf and dock background on and off.
49 ASH_EXPORT extern const int kTimeToSwitchBackgroundMs; 47 ASH_EXPORT extern const int kTimeToSwitchBackgroundMs;
50 48
51 // The base color of the shelf to which different alpha values are applied 49 // The base color of the shelf to which different alpha values are applied
52 // based on the desired shelf opacity level. 50 // based on the desired shelf opacity level.
53 ASH_EXPORT extern const SkColor kShelfBaseColor; 51 ASH_EXPORT extern const SkColor kShelfBaseColor;
54 52
55 // Highlight color used for shelf button activated states. 53 // Highlight color used for shelf button activated states.
56 // TODO(bruthig|mohsen): Use of this color is temporary. Draw the active state 54 // TODO(bruthig|mohsen): Use of this color is temporary. Draw the active state
57 // using the material design ripple animation. 55 // using the material design ripple animation.
(...skipping 21 matching lines...) Expand all
79 extern const int kAppListButtonRadius; 77 extern const int kAppListButtonRadius;
80 78
81 // The direction of the focus cycling. 79 // The direction of the focus cycling.
82 enum CycleDirection { CYCLE_FORWARD, CYCLE_BACKWARD }; 80 enum CycleDirection { CYCLE_FORWARD, CYCLE_BACKWARD };
83 81
84 ASH_EXPORT int GetShelfConstant(ShelfConstant shelf_constant); 82 ASH_EXPORT int GetShelfConstant(ShelfConstant shelf_constant);
85 83
86 } // namespace ash 84 } // namespace ash
87 85
88 #endif // ASH_COMMON_SHELF_SHELF_CONSTANTS_H_ 86 #endif // ASH_COMMON_SHELF_SHELF_CONSTANTS_H_
OLDNEW
« no previous file with comments | « ash/common/mus_property_mirror_ash_unittest.cc ('k') | ash/common/shelf/shelf_item_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698