Enable Ash material design shelf and system menu by default

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 80 matching lines @@
 
 const SkColor kHorizontalSeparatorColor = SkColorSetA(SK_ColorBLACK, 0x1F);
 const int kHorizontalSeparatorHeight = 24;
 
 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};
+  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 &&
          mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL);
 
   switch (constant) {
     case TRAY_ITEM_HEIGHT_LEGACY:
       return kTrayItemHeightLegacy[mode];
     case TRAY_SPACING:
       return kTraySpacing[mode];
@@ skipping 14 matching lines @@
     case TRAY_IME_MENU_ICON:
       return kTrayImeMenuIcon[mode];
     case TRAY_IMAGE_ITEM_PADDING:
       return kTrayImageItemPadding[mode];
   }
   NOTREACHED();
   return 0;
 }
 
 }  // namespace ash