OLD | NEW |
---|---|
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 "ui/app_list/app_list_constants.h" | 5 #include "ui/app_list/app_list_constants.h" |
6 | 6 |
7 namespace app_list { | 7 namespace app_list { |
8 | 8 |
9 const SkColor kContentsBackgroundColor = SkColorSetRGB(0xFB, 0xFB, 0xFB); | 9 const SkColor kContentsBackgroundColor = SkColorSetRGB(0xF5, 0xF5, 0xF5); |
10 const SkColor kSearchBoxBackground = SK_ColorWHITE; | 10 const SkColor kSearchBoxBackground = SK_ColorWHITE; |
11 const SkColor kTopSeparatorColor = SkColorSetRGB(0xE5, 0xE5, 0xE5); | 11 const SkColor kTopSeparatorColor = SkColorSetRGB(0xC4, 0xC4, 0xC4); |
12 const SkColor kBottomSeparatorColor = SkColorSetRGB(0xE5, 0xE5, 0xE5); | 12 const SkColor kBottomSeparatorColor = SkColorSetRGB(0xC4, 0xC4, 0xC4); |
13 | 13 |
14 // The color of the separator used inside dialogs in the app list. | 14 // The color of the separator used inside dialogs in the app list. |
15 const SkColor kDialogSeparatorColor = SkColorSetRGB(0xD1, 0xD1, 0xD1); | 15 const SkColor kDialogSeparatorColor = SkColorSetRGB(0xD1, 0xD1, 0xD1); |
16 | 16 |
17 // 6% black over kContentsBackgroundColor | 17 // 6% black over kContentsBackgroundColor |
18 const SkColor kHighlightedColor = SkColorSetRGB(0xE6, 0xE6, 0xE6); | 18 const SkColor kHighlightedColor = SkColorSetRGB(0xE6, 0xE6, 0xE6); |
19 // 10% black over kContentsBackgroundColor | 19 // 10% black over kContentsBackgroundColor |
20 const SkColor kSelectedColor = SkColorSetRGB(0xF1, 0xF1, 0xF1); | 20 const SkColor kSelectedColor = SkColorSetRGB(0xDC, 0xDC, 0xDC); |
21 | 21 |
22 const SkColor kPagerHoverColor = SkColorSetRGB(0xB4, 0xB4, 0xB4); | 22 const SkColor kPagerHoverColor = SkColorSetRGB(0xB4, 0xB4, 0xB4); |
23 const SkColor kPagerNormalColor = SkColorSetRGB(0xE2, 0xE2, 0xE2); | 23 const SkColor kPagerNormalColor = SkColorSetRGB(0xE2, 0xE2, 0xE2); |
24 const SkColor kPagerSelectedColor = SkColorSetRGB(0x46, 0x8F, 0xFC); | 24 const SkColor kPagerSelectedColor = SkColorSetRGB(0x46, 0x8F, 0xFC); |
25 | 25 |
26 const SkColor kResultBorderColor = SkColorSetRGB(0xE5, 0xE5, 0xE5); | 26 const SkColor kResultBorderColor = SkColorSetRGB(0xE5, 0xE5, 0xE5); |
27 const SkColor kResultDefaultTextColor = SkColorSetRGB(0x33, 0x33, 0x33); | 27 const SkColor kResultDefaultTextColor = SkColorSetRGB(0x33, 0x33, 0x33); |
28 const SkColor kResultDimmedTextColor = SkColorSetRGB(0x96, 0x96, 0x96); | 28 const SkColor kResultDimmedTextColor = SkColorSetRGB(0x96, 0x96, 0x96); |
29 const SkColor kResultURLTextColor = SkColorSetRGB(0x00, 0x99, 0x33); | 29 const SkColor kResultURLTextColor = SkColorSetRGB(0x00, 0x99, 0x33); |
30 | 30 |
31 const SkColor kGridTitleColor = SkColorSetRGB(0x5A, 0x5A, 0x5A); | 31 const SkColor kGridTitleColor = SkColorSetRGB(0x33, 0x33, 0x33); |
Matt Giuca
2014/09/18 08:56:07
The mocks say this should be #333, but this looks
| |
32 // TODO(jstark): What should the text hover color be? | |
32 const SkColor kGridTitleHoverColor = SkColorSetRGB(0x3C, 0x3C, 0x3C); | 33 const SkColor kGridTitleHoverColor = SkColorSetRGB(0x3C, 0x3C, 0x3C); |
Matt Giuca
2014/09/18 08:56:07
Jeff, could you supply a new value for the text ho
Matt Giuca
2014/09/22 00:34:27
Hmm, I'll just use black for now (keeping with the
| |
33 | 34 |
35 const SkColor kFolderTitleColor = SkColorSetRGB(0x33, 0x33, 0x33); | |
Matt Giuca
2014/09/18 08:56:08
Note: This was previously just using the system de
| |
36 const SkColor kFolderTitleHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0); | |
calamity
2014/09/19 05:51:13
Should these textfield colors be the same as the s
Matt Giuca
2014/09/22 00:34:27
I don't think they should intrinsically be the sam
| |
34 // Color of the folder ink bubble. | 37 // Color of the folder ink bubble. |
35 const SkColor kFolderBubbleColor = SkColorSetRGB(0xD7, 0xD7, 0xD7); | 38 const SkColor kFolderBubbleColor = SkColorSetRGB(0xD7, 0xD7, 0xD7); |
36 | 39 |
37 // Duration in milliseconds for page transition. | 40 // Duration in milliseconds for page transition. |
38 const int kPageTransitionDurationInMs = 180; | 41 const int kPageTransitionDurationInMs = 180; |
39 | 42 |
40 // Duration in milliseconds for over scroll page transition. | 43 // Duration in milliseconds for over scroll page transition. |
41 const int kOverscrollPageTransitionDurationMs = 50; | 44 const int kOverscrollPageTransitionDurationMs = 50; |
42 | 45 |
43 // Duration in milliseconds for fading in the target page when opening | 46 // Duration in milliseconds for fading in the target page when opening |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
100 | 103 |
101 #if defined(OS_LINUX) | 104 #if defined(OS_LINUX) |
102 #if defined(GOOGLE_CHROME_BUILD) | 105 #if defined(GOOGLE_CHROME_BUILD) |
103 const char kAppListWMClass[] = "chrome_app_list"; | 106 const char kAppListWMClass[] = "chrome_app_list"; |
104 #else // CHROMIUM_BUILD | 107 #else // CHROMIUM_BUILD |
105 const char kAppListWMClass[] = "chromium_app_list"; | 108 const char kAppListWMClass[] = "chromium_app_list"; |
106 #endif | 109 #endif |
107 #endif | 110 #endif |
108 | 111 |
109 } // namespace app_list | 112 } // namespace app_list |
OLD | NEW |