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

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

Issue 2717973004: Improve painting of cros tray separators. (Closed)
Patch Set: restore include Created 3 years, 9 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/system/tray/tray_constants.h ('k') | ui/gfx/canvas.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/common/system/tray/tray_constants.h" 5 #include "ash/common/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 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 const int kMenuIconSize = 20; 87 const int kMenuIconSize = 20;
88 const SkColor kMenuIconColor = gfx::kChromeIconGrey; 88 const SkColor kMenuIconColor = gfx::kChromeIconGrey;
89 const SkColor kMenuIconColorDisabled = SkColorSetA(gfx::kChromeIconGrey, 0x61); 89 const SkColor kMenuIconColorDisabled = SkColorSetA(gfx::kChromeIconGrey, 0x61);
90 const int kMenuButtonSize = 48; 90 const int kMenuButtonSize = 48;
91 const int kMenuSeparatorVerticalPadding = 4; 91 const int kMenuSeparatorVerticalPadding = 4;
92 const int kMenuExtraMarginFromLeftEdge = 4; 92 const int kMenuExtraMarginFromLeftEdge = 4;
93 const int kMenuEdgeEffectivePadding = 93 const int kMenuEdgeEffectivePadding =
94 kMenuExtraMarginFromLeftEdge + (kMenuButtonSize - kMenuIconSize) / 2; 94 kMenuExtraMarginFromLeftEdge + (kMenuButtonSize - kMenuIconSize) / 2;
95 95
96 const int kHitRegionPadding = 4; 96 const int kHitRegionPadding = 4;
97 const SkColor kTraySeparatorColor = SkColorSetA(SK_ColorWHITE, 0x99);
98 const int kSeparatorWidth = 1; 97 const int kSeparatorWidth = 1;
99 98
100 const SkColor kMenuSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F); 99 const SkColor kMenuSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F);
101 100
102 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; 101 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK;
103 const float kTrayPopupInkDropRippleOpacity = 0.06f; 102 const float kTrayPopupInkDropRippleOpacity = 0.06f;
104 const float kTrayPopupInkDropHighlightOpacity = 0.08f; 103 const float kTrayPopupInkDropHighlightOpacity = 0.08f;
105 const int kTrayPopupInkDropInset = 4; 104 const int kTrayPopupInkDropInset = 4;
106 const int kTrayPopupInkDropCornerRadius = 2; 105 const int kTrayPopupInkDropCornerRadius = 2;
107 106
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 case TRAY_IME_MENU_ICON: 148 case TRAY_IME_MENU_ICON:
150 return kTrayImeMenuIcon[mode]; 149 return kTrayImeMenuIcon[mode];
151 case TRAY_IMAGE_ITEM_PADDING: 150 case TRAY_IMAGE_ITEM_PADDING:
152 return kTrayImageItemPadding[mode]; 151 return kTrayImageItemPadding[mode];
153 } 152 }
154 NOTREACHED(); 153 NOTREACHED();
155 return 0; 154 return 0;
156 } 155 }
157 156
158 } // namespace ash 157 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_constants.h ('k') | ui/gfx/canvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698