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

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

Issue 11748023: M26 new bluetooth UI. List all bluetooth devices in detailed view and automatically discover all BT… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and nit. Created 7 years, 11 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_constants.h ('k') | ash/system/tray/tray_details_view.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 (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 "third_party/skia/include/core/SkColor.h" 7 #include "third_party/skia/include/core/SkColor.h"
8 8
9 namespace ash { 9 namespace ash {
10 10
(...skipping 14 matching lines...) Expand all
25 const int kTrayMenuBottomRowPaddingBetweenItems = -1; 25 const int kTrayMenuBottomRowPaddingBetweenItems = -1;
26 26
27 const int kTrayPopupAutoCloseDelayInSeconds = 2; 27 const int kTrayPopupAutoCloseDelayInSeconds = 2;
28 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; 28 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5;
29 const int kTrayPopupPaddingHorizontal = 18; 29 const int kTrayPopupPaddingHorizontal = 18;
30 const int kTrayPopupPaddingBetweenItems = 10; 30 const int kTrayPopupPaddingBetweenItems = 10;
31 const int kTrayPopupTextSpacingVertical = 4; 31 const int kTrayPopupTextSpacingVertical = 4;
32 32
33 const int kTrayPopupItemHeight = 48; 33 const int kTrayPopupItemHeight = 48;
34 const int kTrayPopupDetailsIconWidth = 25; 34 const int kTrayPopupDetailsIconWidth = 25;
35 const int kTrayPopupScrollSeparatorHeight = 15;
35 const int kTrayRoundedBorderRadius = 2; 36 const int kTrayRoundedBorderRadius = 2;
36 const int kTrayBarButtonWidth = 39; 37 const int kTrayBarButtonWidth = 39;
37 38
38 const SkColor kBackgroundColor = SkColorSetRGB(0xfe, 0xfe, 0xfe); 39 const SkColor kBackgroundColor = SkColorSetRGB(0xfe, 0xfe, 0xfe);
39 const SkColor kHoverBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5); 40 const SkColor kHoverBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5);
40 const SkColor kPublicAccountBackgroundColor = SkColorSetRGB(0xf8, 0xe5, 0xb6); 41 const SkColor kPublicAccountBackgroundColor = SkColorSetRGB(0xf8, 0xe5, 0xb6);
41 const SkColor kPublicAccountUserCardTextColor = SkColorSetRGB(0x66, 0x66, 0x66); 42 const SkColor kPublicAccountUserCardTextColor = SkColorSetRGB(0x66, 0x66, 0x66);
42 const SkColor kPublicAccountUserCardNameColor = SK_ColorBLACK; 43 const SkColor kPublicAccountUserCardNameColor = SK_ColorBLACK;
43 44
44 const SkColor kHeaderBackgroundColorLight = SkColorSetRGB(0xf1, 0xf1, 0xf1); 45 const SkColor kHeaderBackgroundColorLight = SkColorSetRGB(0xf1, 0xf1, 0xf1);
45 const SkColor kHeaderBackgroundColorDark = SkColorSetRGB(0xe7, 0xe7, 0xe7); 46 const SkColor kHeaderBackgroundColorDark = SkColorSetRGB(0xe7, 0xe7, 0xe7);
46 47
47 const SkColor kBorderDarkColor = SkColorSetRGB(0xaa, 0xaa, 0xaa); 48 const SkColor kBorderDarkColor = SkColorSetRGB(0xaa, 0xaa, 0xaa);
48 const SkColor kBorderLightColor = SkColorSetRGB(0xeb, 0xeb, 0xeb); 49 const SkColor kBorderLightColor = SkColorSetRGB(0xeb, 0xeb, 0xeb);
49 const SkColor kButtonStrokeColor = SkColorSetRGB(0xdd, 0xdd, 0xdd); 50 const SkColor kButtonStrokeColor = SkColorSetRGB(0xdd, 0xdd, 0xdd);
50 51
51 const SkColor kHeaderTextColorNormal = SkColorSetARGB(0x7f, 0, 0, 0); 52 const SkColor kHeaderTextColorNormal = SkColorSetARGB(0x7f, 0, 0, 0);
52 const SkColor kHeaderTextColorHover = SkColorSetARGB(0xd3, 0, 0, 0); 53 const SkColor kHeaderTextColorHover = SkColorSetARGB(0xd3, 0, 0, 0);
53 54
54 const int kTrayPopupMinWidth = 300; 55 const int kTrayPopupMinWidth = 300;
55 const int kTrayPopupMaxWidth = 500; 56 const int kTrayPopupMaxWidth = 500;
56 const int kNotificationIconWidth = 40; 57 const int kNotificationIconWidth = 40;
57 // TODO(stevenjb): This calculation is wrong (http://crbug.com/163402). 58 // TODO(stevenjb): This calculation is wrong (http://crbug.com/163402).
58 const int kTrayNotificationContentsWidth = kTrayPopupMinWidth - 59 const int kTrayNotificationContentsWidth = kTrayPopupMinWidth -
59 (kNotificationIconWidth + kTrayPopupPaddingHorizontal) * 2; 60 (kNotificationIconWidth + kTrayPopupPaddingHorizontal) * 2;
60 61
61 } // namespace ash 62 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_constants.h ('k') | ash/system/tray/tray_details_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698