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

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 "ash/common/material_design/material_design_controller.h"
 #include "base/logging.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/gfx/color_palette.h"
@@ skipping 35 matching lines @@
 const int kTrayPopupTextSpacingVertical = 4;
 const int kTrayPopupUserCardVerticalPadding = 10;
 const int kTrayPopupSliderPaddingMD = 16;
 
 const int kTrayPopupDetailsIconWidth = 25;
 const int kTrayPopupDetailsLabelExtraLeftMargin = 8;
 const SkColor kTrayPopupHoverBackgroundColor = SkColorSetRGB(0xe4, 0xe4, 0xe4);
 const int kTrayPopupScrollSeparatorHeight = 15;
 const int kTrayRoundedBorderRadius = 2;
 
+const int kTrayPopupLabelHorizontalPadding = 4;

[tdanderson, 2016/11/01 18:59:43]

I think this may be a duplicate of kTrayPopupTextSpacingVertical in this file.

[bruthig, 2016/11/01 23:00:43]

kTrayPopupTextSpacingVertical doesn't appear to be used so I removed it.

+
 const SkColor kBackgroundColor = SkColorSetRGB(0xfe, 0xfe, 0xfe);
 const SkColor kHoverBackgroundColor = SkColorSetRGB(0xf3, 0xf3, 0xf3);
 const SkColor kPublicAccountBackgroundColor = SkColorSetRGB(0xf8, 0xe5, 0xb6);
 const SkColor kPublicAccountUserCardTextColor = SkColorSetRGB(0x66, 0x66, 0x66);
 const SkColor kPublicAccountUserCardNameColor = SK_ColorBLACK;
 
 const SkColor kHeaderBackgroundColor = SkColorSetRGB(0xf5, 0xf5, 0xf5);
 
 const SkColor kBorderDarkColor = SkColorSetRGB(0xaa, 0xaa, 0xaa);
 const SkColor kBorderLightColor = SkColorSetRGB(0xeb, 0xeb, 0xeb);
@@ skipping 28 matching lines @@
 
 const SkColor kTrayPopupInkDropBaseColor = SK_ColorBLACK;
 const float kTrayPopupInkDropRippleOpacity = 0.06f;
 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};
-  // TODO(bruthig): Use the correct values for non-material design.
+  const int kTrayPopupItemHeight[] = {46, 48, 48};

[tdanderson, 2016/11/01 18:59:44]

Note that since these arrays have the form {a, b, b} (the material normal value
is the same as the material experimental value) make sure
https://chromiumcodereview.appspot.com/2454393002 has landed before this CL goes
into the commit queue.

[bruthig, 2016/11/01 23:00:43]

Acknowledged.

+  // 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};
-  // TODO(bruthig): Use the correct values for non-material design.
-  const int kTrayPopupItemRightInset[] = {0, 0, 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 kTrayPopupItemRightInset[] = {0, 0, 0};
+  const int kTrayPopupItemMinStartWidth[] = {46, 48, 48};
+  const int kTrayPopupItemMinEndWidth[] = {40, 40, 40};
   const int kVirtualKeyboardButtonSize[] = {39, 39, kTrayItemSize};
   const int kTrayImeMenuIcon[] = {40, 40, kTrayItemSize};
   const int kTrayImageItemPadding[] = {1, 1, 3};
 
   const int mode = MaterialDesignController::GetMode();
   DCHECK(mode >= MaterialDesignController::NON_MATERIAL &&
          mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL);
 
   switch (constant) {
     case TRAY_ITEM_HEIGHT_LEGACY:
       return kTrayItemHeightLegacy[mode];
     case TRAY_SPACING:
       return kTraySpacing[mode];
     case TRAY_PADDING_FROM_EDGE_OF_SHELF:
       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:
       return kTrayPopupItemRightInset[mode];
     case TRAY_POPUP_ITEM_MIN_START_WIDTH:
       return kTrayPopupItemMinStartWidth[mode];
     case TRAY_POPUP_ITEM_MIN_END_WIDTH:
       return kTrayPopupItemMinEndWidth[mode];
     case VIRTUAL_KEYBOARD_BUTTON_SIZE:
       return kVirtualKeyboardButtonSize[mode];
     case TRAY_IME_MENU_ICON:
       return kTrayImeMenuIcon[mode];
     case TRAY_IMAGE_ITEM_PADDING:
       return kTrayImageItemPadding[mode];
   }
   NOTREACHED();
   return 0;
 }
 
 }  // namespace ash