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

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

Issue 2463163002: Update chromeos system menu buttons for MD. (Closed)
Patch Set: rebase 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
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 25 matching lines...) Expand all
36 // Vertical padding between status tray items when the shelf is vertical. 36 // Vertical padding between status tray items when the shelf is vertical.
37 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4; 37 const int kTrayLabelItemVerticalPaddingVerticalAlignment = 4;
38 38
39 const int kTrayMenuBottomRowPadding = 5; 39 const int kTrayMenuBottomRowPadding = 5;
40 const int kTrayMenuBottomRowPaddingBetweenItems = -1; 40 const int kTrayMenuBottomRowPaddingBetweenItems = -1;
41 41
42 const int kTrayPopupAutoCloseDelayInSeconds = 2; 42 const int kTrayPopupAutoCloseDelayInSeconds = 2;
43 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5; 43 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5;
44 const int kTrayPopupPaddingHorizontal = 18; 44 const int kTrayPopupPaddingHorizontal = 18;
45 const int kTrayPopupPaddingBetweenItems = 10; 45 const int kTrayPopupPaddingBetweenItems = 10;
46 const int kTrayPopupButtonEndMargin = 10;
46 const int kTrayPopupTextSpacingVertical = 4; 47 const int kTrayPopupTextSpacingVertical = 4;
47 const int kTrayPopupUserCardVerticalPadding = 10; 48 const int kTrayPopupUserCardVerticalPadding = 10;
48 const int kTrayPopupSliderPaddingMD = 16; 49 const int kTrayPopupSliderPaddingMD = 16;
49 50
50 const int kTrayPopupDetailsIconWidth = 25; 51 const int kTrayPopupDetailsIconWidth = 25;
51 const int kTrayPopupDetailsLabelExtraLeftMargin = 8; 52 const int kTrayPopupDetailsLabelExtraLeftMargin = 8;
52 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4); 53 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4);
53 const int kTrayPopupScrollSeparatorHeight = 15; 54 const int kTrayPopupScrollSeparatorHeight = 15;
54 const int kTrayRoundedBorderRadius = 2; 55 const int kTrayRoundedBorderRadius = 2;
55 56
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 case TRAY_IME_MENU_ICON: 141 case TRAY_IME_MENU_ICON:
141 return kTrayImeMenuIcon[mode]; 142 return kTrayImeMenuIcon[mode];
142 case TRAY_IMAGE_ITEM_PADDING: 143 case TRAY_IMAGE_ITEM_PADDING:
143 return kTrayImageItemPadding[mode]; 144 return kTrayImageItemPadding[mode];
144 } 145 }
145 NOTREACHED(); 146 NOTREACHED();
146 return 0; 147 return 0;
147 } 148 }
148 149
149 } // namespace ash 150 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698