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

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

Issue 2838273002: Reland 097f9cde453ea57eb4aa037f44add782391c5eb9 (Closed)
Patch Set: rebase Created 3 years, 7 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/system/tray/tray_constants.h ('k') | ash/system/tray/tray_details_view.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 #include "ash/system/tray/tray_constants.h" 5 #include "ash/system/tray/tray_constants.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "third_party/skia/include/core/SkColor.h" 8 #include "third_party/skia/include/core/SkColor.h"
9 #include "ui/gfx/color_palette.h" 9 #include "ui/gfx/color_palette.h"
10 10
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 const int kTrayDetailedViewTransitionDelayMs = 100; 57 const int kTrayDetailedViewTransitionDelayMs = 100;
58 58
59 const int kTrayPopupLabelRightPadding = 8; 59 const int kTrayPopupLabelRightPadding = 8;
60 60
61 const int kTrayPopupDetailsIconWidth = 25; 61 const int kTrayPopupDetailsIconWidth = 25;
62 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4); 62 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4);
63 const int kTrayRoundedBorderRadius = 2; 63 const int kTrayRoundedBorderRadius = 2;
64 64
65 const int kTrayToggleButtonWidth = 68; 65 const int kTrayToggleButtonWidth = 68;
66 66
67 const SkColor kBackgroundColor = SK_ColorWHITE;
68 const SkColor kPublicAccountUserCardTextColor = SkColorSetRGB(0x66, 0x66, 0x66); 67 const SkColor kPublicAccountUserCardTextColor = SkColorSetRGB(0x66, 0x66, 0x66);
69 const SkColor kPublicAccountUserCardNameColor = SK_ColorBLACK; 68 const SkColor kPublicAccountUserCardNameColor = SK_ColorBLACK;
70 69
71 const SkColor kHeaderBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5); 70 const SkColor kHeaderBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5);
72 71
73 const SkColor kHeaderTextColorNormal = SkColorSetARGB(0x7f, 0, 0, 0); 72 const SkColor kHeaderTextColorNormal = SkColorSetARGB(0x7f, 0, 0, 0);
74 const SkColor kHeaderTextColorHover = SkColorSetARGB(0xd3, 0, 0, 0); 73 const SkColor kHeaderTextColorHover = SkColorSetARGB(0xd3, 0, 0, 0);
75 74
76 const int kTrayPopupMinWidth = 300; 75 const int kTrayPopupMinWidth = 300;
77 const int kTrayPopupMaxWidth = 500; 76 const int kTrayPopupMaxWidth = 500;
(...skipping 22 matching lines...) Expand all
100 99
101 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; 100 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK;
102 const float kTrayPopupInkDropRippleOpacity = 0.06f; 101 const float kTrayPopupInkDropRippleOpacity = 0.06f;
103 const float kTrayPopupInkDropHighlightOpacity = 0.08f; 102 const float kTrayPopupInkDropHighlightOpacity = 0.08f;
104 const int kTrayPopupInkDropInset = 4; 103 const int kTrayPopupInkDropInset = 4;
105 const int kTrayPopupInkDropCornerRadius = 2; 104 const int kTrayPopupInkDropCornerRadius = 2;
106 105
107 const int kTrayPopupSystemInfoRowHeight = 40; 106 const int kTrayPopupSystemInfoRowHeight = 40;
108 107
109 } // namespace ash 108 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_constants.h ('k') | ash/system/tray/tray_details_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698