Remove non-MD code from StatusAreaWidgetDelegate

ash/common/system/tray/tray_constants.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/system/tray/tray_constants.h"
 
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/color_palette.h"
 
@@ skipping 89 matching lines @@
 const SkColor kMenuSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F);
 
 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK;
 const float kTrayPopupInkDropRippleOpacity = 0.06f;
 const float kTrayPopupInkDropHighlightOpacity = 0.08f;
 const int kTrayPopupInkDropInset = 4;
 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.
   const int kTrayPopupItemMainImageRegionWidth[] = {0, 48, 48};
   const int kTrayPopupItemMoreImageSize[] = {25, kMenuIconSize, kMenuIconSize};
   const int kTrayPopupItemMoreRegionHorizontalInset[] = {10, 10, 10};
   const int kTrayPopupItemLeftInset[] = {0, 4, 4};
   const int kTrayPopupItemMinStartWidth[] = {46, 48, 48};
   const int kTrayPopupItemMinEndWidth[] = {40, 40, 40};
   const int kTrayImeMenuIcon[] = {40, kTrayItemSize, kTrayItemSize};
   const int kTrayImageItemPadding[] = {1, 3, 3};
 
   // TODO(estade): clean this up --- remove unneeded constants and reduce
   // 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:
       return kTrayPopupItemMaxHeight[mode];
     case TRAY_POPUP_ITEM_MAIN_IMAGE_CONTAINER_WIDTH:
       return kTrayPopupItemMainImageRegionWidth[mode];
     case TRAY_POPUP_ITEM_MORE_IMAGE_SIZE:
       return kTrayPopupItemMoreImageSize[mode];
     case TRAY_POPUP_ITEM_MORE_REGION_HORIZONTAL_INSET:
       return kTrayPopupItemMoreRegionHorizontalInset[mode];
     case TRAY_POPUP_ITEM_LEFT_INSET:
       return kTrayPopupItemLeftInset[mode];
     case TRAY_POPUP_ITEM_MIN_START_WIDTH:
       return kTrayPopupItemMinStartWidth[mode];
     case TRAY_POPUP_ITEM_MIN_END_WIDTH:
       return kTrayPopupItemMinEndWidth[mode];
     case TRAY_IME_MENU_ICON:
       return kTrayImeMenuIcon[mode];
     case TRAY_IMAGE_ITEM_PADDING:
       return kTrayImageItemPadding[mode];
   }
   NOTREACHED();
   return 0;
 }
 
 }  // namespace ash