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

Unified Diff: ash/common/system/tray/tray_constants.cc

Issue 2454393002: Enable Ash material design shelf and system menu by default (Closed)
Patch Set: rebase 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/common/shelf/shelf_constants.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_constants.cc
diff --git a/ash/common/system/tray/tray_constants.cc b/ash/common/system/tray/tray_constants.cc
index 2cfd4cdb1d18728aa98f6c6d6c1ebca113dc40b0..a4614d59b0ef1b1c115e88dca5cf5e9e688eb006 100644
--- a/ash/common/system/tray/tray_constants.cc
+++ b/ash/common/system/tray/tray_constants.cc
@@ -98,21 +98,21 @@ const float kTrayPopupInkDropHighlightOpacity = 0.08f;
const int kTrayPopupInkDropInset = 4;
int GetTrayConstant(TrayConstant constant) {
- const int kTrayItemHeightLegacy[] = {38, 38, kTrayItemSize};
- const int kTraySpacing[] = {4, 4, 0};
- const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 4};
- const int kTrayPopupItemHeight[] = {46, 46, 48};
+ const int kTrayItemHeightLegacy[] = {38, kTrayItemSize, kTrayItemSize};
+ const int kTraySpacing[] = {4, 0, 0};
+ const int kTrayPaddingFromEdgeOfShelf[] = {3, 4, 4};
+ const int kTrayPopupItemHeight[] = {46, 48, 48};
// TODO(bruthig): Use the correct values for non-material design.
- const int kTrayPopupItemLeftInset[] = {0, 0, 4};
+ const int kTrayPopupItemLeftInset[] = {0, 4, 4};
// TODO(bruthig): Use the correct values for non-material design.
- const int kTrayPopupItemRightInset[] = {0, 0, 4};
+ const int kTrayPopupItemRightInset[] = {0, 4, 4};
// TODO(bruthig): Use the correct values for non-material design.
const int kTrayPopupItemMinStartWidth[] = {48, 48, 48};
// TODO(bruthig): Use the correct values for non-material design.
const int kTrayPopupItemMinEndWidth[] = {48, 48, 48};
- const int kVirtualKeyboardButtonSize[] = {39, 39, kTrayItemSize};
- const int kTrayImeMenuIcon[] = {40, 40, kTrayItemSize};
- const int kTrayImageItemPadding[] = {1, 1, 3};
+ const int kVirtualKeyboardButtonSize[] = {39, kTrayItemSize, kTrayItemSize};
+ const int kTrayImeMenuIcon[] = {40, kTrayItemSize, kTrayItemSize};
+ const int kTrayImageItemPadding[] = {1, 3, 3};
const int mode = MaterialDesignController::GetMode();
DCHECK(mode >= MaterialDesignController::NON_MATERIAL &&
« no previous file with comments | « ash/common/shelf/shelf_constants.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698