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

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

Issue 2706403013: Remove non-MD code from StatusAreaWidgetDelegate (Closed)
Patch Set: Rebased Created 3 years, 10 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/system/tray/tray_constants.h ('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 43f6a24319c6755932a8efb0628c3202dc7c828b..702ea9dee2809c85e9ed89abc50751d19af0ca0c 100644
--- a/ash/common/system/tray/tray_constants.cc
+++ b/ash/common/system/tray/tray_constants.cc
@@ -107,9 +107,9 @@ const int kTrayPopupInkDropCornerRadius = 2;
const int kTrayPopupSystemInfoRowHeight = 40;
+const int kTrayPaddingFromEdgeOfShelf = 3;
+
int GetTrayConstant(TrayConstant constant) {
- const int kTrayItemHeightLegacy[] = {38, kTrayItemSize, kTrayItemSize};
- const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 3};
const int kTrayPopupItemMinHeight[] = {46, 48, 48};
const int kTrayPopupItemMaxHeight[] = {138, 144, 144};
// FixedSizedImageViews use the contained ImageView's width for 0 values.
@@ -126,10 +126,6 @@ int GetTrayConstant(TrayConstant constant) {
// remaining arrays to a single constant.
const int mode = 1;
switch (constant) {
- case TRAY_ITEM_HEIGHT_LEGACY:
- return kTrayItemHeightLegacy[mode];
- case TRAY_PADDING_FROM_EDGE_OF_SHELF:
- return kTrayPaddingFromEdgeOfShelf[mode];
case TRAY_POPUP_ITEM_MIN_HEIGHT:
return kTrayPopupItemMinHeight[mode];
case TRAY_POPUP_ITEM_MAX_HEIGHT:
« no previous file with comments | « ash/common/system/tray/tray_constants.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698