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

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

Issue 2470543002: [Chrome OS MD] Update Tray Separator Opacity (Closed)
Patch Set: Created 4 years, 1 month 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 | « no previous file | no next file » | 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 "ash/common/material_design/material_design_controller.h" 7 #include "ash/common/material_design/material_design_controller.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "third_party/skia/include/core/SkColor.h" 9 #include "third_party/skia/include/core/SkColor.h"
10 #include "ui/gfx/color_palette.h" 10 #include "ui/gfx/color_palette.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 const int kTrayIconSize = 16; 79 const int kTrayIconSize = 16;
80 const SkColor kTrayIconColor = SK_ColorWHITE; 80 const SkColor kTrayIconColor = SK_ColorWHITE;
81 const int kMenuIconSize = 20; 81 const int kMenuIconSize = 20;
82 const SkColor kMenuIconColor = gfx::kChromeIconGrey; 82 const SkColor kMenuIconColor = gfx::kChromeIconGrey;
83 const SkColor kMenuIconColorDisabled = SkColorSetA(gfx::kChromeIconGrey, 0x61); 83 const SkColor kMenuIconColorDisabled = SkColorSetA(gfx::kChromeIconGrey, 0x61);
84 const int kMenuButtonSize = 48; 84 const int kMenuButtonSize = 48;
85 const int kMenuSeparatorVerticalPadding = 4; 85 const int kMenuSeparatorVerticalPadding = 4;
86 const int kMenuExtraMarginFromLeftEdge = 4; 86 const int kMenuExtraMarginFromLeftEdge = 4;
87 87
88 const int kHitRegionPadding = 4; 88 const int kHitRegionPadding = 4;
89 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x4D); 89 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x99);
90 const int kSeparatorWidth = 1; 90 const int kSeparatorWidth = 1;
91 91
92 const SkColor kHorizontalSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F); 92 const SkColor kHorizontalSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F);
93 const int kHorizontalSeparatorHeight = 24; 93 const int kHorizontalSeparatorHeight = 24;
94 94
95 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK; 95 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK;
96 const float kTrayPopupInkDropRippleOpacity = 0.06f; 96 const float kTrayPopupInkDropRippleOpacity = 0.06f;
97 const float kTrayPopupInkDropHighlightOpacity = 0.08f; 97 const float kTrayPopupInkDropHighlightOpacity = 0.08f;
98 const int kTrayPopupInkDropInset = 4; 98 const int kTrayPopupInkDropInset = 4;
99 99
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 case TRAY_IME_MENU_ICON: 140 case TRAY_IME_MENU_ICON:
141 return kTrayImeMenuIcon[mode]; 141 return kTrayImeMenuIcon[mode];
142 case TRAY_IMAGE_ITEM_PADDING: 142 case TRAY_IMAGE_ITEM_PADDING:
143 return kTrayImageItemPadding[mode]; 143 return kTrayImageItemPadding[mode];
144 } 144 }
145 NOTREACHED(); 145 NOTREACHED();
146 return 0; 146 return 0;
147 } 147 }
148 148
149 } // namespace ash 149 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698