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

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

Issue 2429923002: Implement all system menu title row buttons for Ash MD (Closed)
Patch Set: OS_WIN define in tests Created 4 years, 2 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') | ash/common/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/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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 const int kNotificationIconWidth = 40; 73 const int kNotificationIconWidth = 40;
74 const int kNotificationButtonWidth = 32; 74 const int kNotificationButtonWidth = 32;
75 const int kTrayNotificationContentsWidth = 75 const int kTrayNotificationContentsWidth =
76 kTrayPopupMinWidth - (kNotificationIconWidth + kNotificationButtonWidth + 76 kTrayPopupMinWidth - (kNotificationIconWidth + kNotificationButtonWidth +
77 (kTrayPopupPaddingHorizontal / 2) * 3); 77 (kTrayPopupPaddingHorizontal / 2) * 3);
78 78
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 int kMenuButtonSize = 48; 84 const int kMenuButtonSize = 48;
84 const int kMenuSeparatorVerticalPadding = 4; 85 const int kMenuSeparatorVerticalPadding = 4;
85 const int kMenuExtraMarginFromLeftEdge = 4; 86 const int kMenuExtraMarginFromLeftEdge = 4;
86 87
87 const int kHitRegionPadding = 4; 88 const int kHitRegionPadding = 4;
88 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x4D); 89 const SkColor kSeparatorColor = SkColorSetA(SK_ColorWHITE, 0x4D);
89 const int kSeparatorWidth = 1; 90 const int kSeparatorWidth = 1;
90 91
91 const SkColor kHorizontalSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F); 92 const SkColor kHorizontalSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F);
92 const int kHorizontalSeparatorHeight = 24; 93 const int kHorizontalSeparatorHeight = 24;
(...skipping 25 matching lines...) Expand all
118 case TRAY_IME_MENU_ICON: 119 case TRAY_IME_MENU_ICON:
119 return kTrayImeMenuIcon[mode]; 120 return kTrayImeMenuIcon[mode];
120 case TRAY_IMAGE_ITEM_PADDING: 121 case TRAY_IMAGE_ITEM_PADDING:
121 return kTrayImageItemPadding[mode]; 122 return kTrayImageItemPadding[mode];
122 } 123 }
123 NOTREACHED(); 124 NOTREACHED();
124 return 0; 125 return 0;
125 } 126 }
126 127
127 } // namespace ash 128 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_constants.h ('k') | ash/common/system/tray/tray_details_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698