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

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

Issue 2327943002: Vectorize help icon in Ash system menu for MD (Closed)
Patch Set: Addressed review comments Created 4 years, 3 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/date/date_default_view.cc ('k') | ash/resources/vector_icons/BUILD.gn » ('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 "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 11
11 namespace ash { 12 namespace ash {
12 13
13 const int kPaddingFromRightEdgeOfScreenBottomAlignment = 7; 14 const int kPaddingFromRightEdgeOfScreenBottomAlignment = 7;
14 const int kPaddingFromBottomOfScreenBottomAlignment = 7; 15 const int kPaddingFromBottomOfScreenBottomAlignment = 7;
15 const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment = 8; 16 const int kPaddingFromOuterEdgeOfLauncherVerticalAlignment = 8;
16 const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment = 9; 17 const int kPaddingFromInnerEdgeOfLauncherVerticalAlignment = 9;
17 const int kPaddingFromBottomOfScreenVerticalAlignment = 10; 18 const int kPaddingFromBottomOfScreenVerticalAlignment = 10;
18 19
19 // Padding used to position the system menu relative to the status area. 20 // Padding used to position the system menu relative to the status area.
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 const int kNotificationButtonWidth = 32; 81 const int kNotificationButtonWidth = 32;
81 const int kTrayNotificationContentsWidth = 82 const int kTrayNotificationContentsWidth =
82 kTrayPopupMinWidth - (kNotificationIconWidth + kNotificationButtonWidth + 83 kTrayPopupMinWidth - (kNotificationIconWidth + kNotificationButtonWidth +
83 (kTrayPopupPaddingHorizontal / 2) * 3); 84 (kTrayPopupPaddingHorizontal / 2) * 3);
84 85
85 const int kMessageCenterBubblePadding = 4; 86 const int kMessageCenterBubblePadding = 4;
86 87
87 const int kTrayIconSize = 16; 88 const int kTrayIconSize = 16;
88 const SkColor kTrayIconColor = SK_ColorWHITE; 89 const SkColor kTrayIconColor = SK_ColorWHITE;
89 const int kMenuIconSize = 20; 90 const int kMenuIconSize = 20;
90 const SkColor kMenuIconColor = SkColorSetRGB(0x5A, 0x5A, 0x5A); 91 const SkColor kMenuIconColor = gfx::kChromeIconGrey;
91 92
92 const int kHitRegionPadding = 4; 93 const int kHitRegionPadding = 4;
93 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x4D); 94 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x4D);
94 const int kSeparatorWidth = 1; 95 const int kSeparatorWidth = 1;
95 96
96 int GetTrayConstant(TrayConstant constant) { 97 int GetTrayConstant(TrayConstant constant) {
97 const int kTrayItemHeightLegacy[] = {38, 38, kTrayItemSize}; 98 const int kTrayItemHeightLegacy[] = {38, 38, kTrayItemSize};
98 const int kTraySpacing[] = {4, 4, 0}; 99 const int kTraySpacing[] = {4, 4, 0};
99 const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 4}; 100 const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 4};
100 const int kTrayPopupItemHeight[] = {46, 46, 48}; 101 const int kTrayPopupItemHeight[] = {46, 46, 48};
(...skipping 13 matching lines...) Expand all
114 case TRAY_POPUP_ITEM_HEIGHT: 115 case TRAY_POPUP_ITEM_HEIGHT:
115 return kTrayPopupItemHeight[mode]; 116 return kTrayPopupItemHeight[mode];
116 case VIRTUAL_KEYBOARD_BUTTON_SIZE: 117 case VIRTUAL_KEYBOARD_BUTTON_SIZE:
117 return kVirtualKeyboardButtonSize[mode]; 118 return kVirtualKeyboardButtonSize[mode];
118 } 119 }
119 NOTREACHED(); 120 NOTREACHED();
120 return 0; 121 return 0;
121 } 122 }
122 123
123 } // namespace ash 124 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/date/date_default_view.cc ('k') | ash/resources/vector_icons/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698