[ash-md] Applied Material Design layout to TrayItemMore system menu rows.

ash/common/system/tray/tray_constants.cc

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 30817d37f9849fca07ed0ce0fa4461d48eb53c37..eb6e7d08115da6747e3b40a718f2ed3ec72dadb2 100644
--- a/ash/common/system/tray/tray_constants.cc
+++ b/ash/common/system/tray/tray_constants.cc
@@ -43,8 +43,8 @@ const int kTrayPopupAutoCloseDelayInSeconds = 2;
 const int kTrayPopupAutoCloseDelayForTextInSeconds = 5;
 const int kTrayPopupPaddingHorizontal = 18;
 const int kTrayPopupPaddingBetweenItems = 10;
-const int kTrayPopupTextSpacingVertical = 4;
 const int kTrayPopupUserCardVerticalPadding = 10;
+const int kTrayPopupLabelHorizontalPadding = 4;
 const int kTrayPopupSliderPaddingMD = 16;
 
 const int kTrayPopupDetailsIconWidth = 25;
@@ -102,14 +102,14 @@ int GetTrayConstant(TrayConstant constant) {
   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, 4, 4};
-  // TODO(bruthig): Use the correct values for non-material design.
-  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};
+  // FixedSizedImageViews use the contained ImageView's width for 0 values.
+  const int kTrayPopupItemMainImageRegionWidth[] = {0, 48, 48};
+  // FixedSizedImageViews use the contained ImageView's width for 0 values.
+  const int kTrayPopupItemMoreImageRegionWidth[] = {0, 20, 20};
+  const int kTrayPopupItemLeftInset[] = {0, 0, 4};
+  const int kTrayPopupItemRightInset[] = {0, 0, 0};
+  const int kTrayPopupItemMinStartWidth[] = {46, 48, 48};
+  const int kTrayPopupItemMinEndWidth[] = {40, 40, 40};
   const int kVirtualKeyboardButtonSize[] = {39, kTrayItemSize, kTrayItemSize};
   const int kTrayImeMenuIcon[] = {40, kTrayItemSize, kTrayItemSize};
   const int kTrayImageItemPadding[] = {1, 3, 3};
@@ -127,6 +127,10 @@ int GetTrayConstant(TrayConstant constant) {
       return kTrayPaddingFromEdgeOfShelf[mode];
     case TRAY_POPUP_ITEM_HEIGHT:
       return kTrayPopupItemHeight[mode];
+    case TRAY_POPUP_ITEM_MAIN_IMAGE_CONTAINER_WIDTH:
+      return kTrayPopupItemMainImageRegionWidth[mode];
+    case TRAY_POPUP_ITEM_MORE_IMAGE_CONTAINER_WIDTH:
+      return kTrayPopupItemMoreImageRegionWidth[mode];
     case TRAY_POPUP_ITEM_LEFT_INSET:
       return kTrayPopupItemLeftInset[mode];
     case TRAY_POPUP_ITEM_RIGHT_INSET: