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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/system/tray/tray_constants.h

Issue 229453005: Shelf Cleanup AlternateShelfLayout P1 Attempt 3 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/system/tray/tray_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 (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_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 5 #ifndef ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_
6 #define ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 6 #define ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 9
10 typedef unsigned int SkColor; 10 typedef unsigned int SkColor;
11 11
12 namespace ash { 12 namespace ash {
13 13
14 extern const int kPaddingFromRightEdgeOfScreenBottomAlignment; 14 extern const int kPaddingFromRightEdgeOfScreenBottomAlignment;
15 extern const int kPaddingFromBottomOfScreenBottomAlignment; 15 extern const int kPaddingFromBottomOfScreenBottomAlignment;
16 extern const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment; 16 extern const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment;
17 extern const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment; 17 extern const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment;
18 extern const int kPaddingFromBottomOfScreenVerticalAlignment; 18 extern const int kPaddingFromBottomOfScreenVerticalAlignment;
19 19
20 extern const int kAlternateLayoutBubblePaddingHorizontalBottom; 20 extern const int kBubblePaddingHorizontalBottom;
21 extern const int kAlternateLayoutBubblePaddingHorizontalSide; 21 extern const int kBubblePaddingHorizontalSide;
22 extern const int kAlternateLayoutBubblePaddingVerticalBottom; 22 extern const int kBubblePaddingVerticalBottom;
23 extern const int kAlternateLayoutBubblePaddingVerticalSide; 23 extern const int kBubblePaddingVerticalSide;
24 24
25 extern const int kPaddingFromEdgeOfShelf; 25 extern const int kPaddingFromEdgeOfShelf;
26 extern const int kTrayBubbleAnchorTopInsetBottomAnchor; 26 extern const int kTrayBubbleAnchorTopInsetBottomAnchor;
27 27
28 extern const int kTrayImageItemHorizontalPaddingBottomAlignment; 28 extern const int kTrayImageItemHorizontalPaddingBottomAlignment;
29 extern const int kTrayImageItemHorizontalPaddingVerticalAlignment; 29 extern const int kTrayImageItemHorizontalPaddingVerticalAlignment;
30 extern const int kTrayImageItemVerticalPaddingVerticalAlignment; 30 extern const int kTrayImageItemVerticalPaddingVerticalAlignment;
31 31
32 ASH_EXPORT extern const int kTrayItemSize; 32 ASH_EXPORT extern const int kTrayItemSize;
33 33
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 65
66 extern const SkColor kHeaderTextColorNormal; 66 extern const SkColor kHeaderTextColorNormal;
67 extern const SkColor kHeaderTextColorHover; 67 extern const SkColor kHeaderTextColorHover;
68 68
69 extern const int kTrayPopupMinWidth; 69 extern const int kTrayPopupMinWidth;
70 extern const int kTrayPopupMaxWidth; 70 extern const int kTrayPopupMaxWidth;
71 extern const int kNotificationIconWidth; 71 extern const int kNotificationIconWidth;
72 extern const int kNotificationButtonWidth; 72 extern const int kNotificationButtonWidth;
73 extern const int kTrayNotificationContentsWidth; 73 extern const int kTrayNotificationContentsWidth;
74 74
75
75 extern const int kTrayAvatarCornerRadius; 76 extern const int kTrayAvatarCornerRadius;
76 extern const int kTrayAvatarSize; 77 extern const int kTrayAvatarSize;
77 78
78 // Returns kTraySpacing or kAlternateTraySpacing as applicable 79 extern const int kTraySpacing;
79 // (Determined by ash::switches::UseAlternateShelfLayout). 80 extern const int kShelfItemHeight;
80 int GetTraySpacing();
81
82 // Returns kShelfItemHeight or kAlternateShelfItemHeight as applicable
83 // (Determined by ash::switches::UseAlternateShelfLayout).
84 int GetShelfItemHeight();
85 81
86 namespace test { 82 namespace test {
87 const int kSettingsTrayItemViewId = 10000; 83 const int kSettingsTrayItemViewId = 10000;
88 const int kAccessibilityTrayItemViewId = 10001; 84 const int kAccessibilityTrayItemViewId = 10001;
89 } // namespace test 85 } // namespace test
90 86
91 } // namespace ash 87 } // namespace ash
92 88
93 #endif // ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_ 89 #endif // ASH_SYSTEM_TRAY_TRAY_CONSTANTS_H_
OLDNEW
« no previous file with comments | « ash/system/tray/tray_background_view.cc ('k') | ash/system/tray/tray_constants.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698