Simplify layout of tray items and fix spacing for MD.

ash/common/system/tray/tray_utils.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_utils.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/tray_constants.h"
@@ skipping 19 matching lines @@
         gfx::FontList().Derive(1, gfx::Font::NORMAL, gfx::Font::Weight::BOLD));
     label->SetShadows(gfx::ShadowValues(
         1,
         gfx::ShadowValue(gfx::Vector2d(0, 1), 0, SkColorSetARGB(64, 0, 0, 0))));
     label->SetAutoColorReadabilityEnabled(false);
     label->SetEnabledColor(SK_ColorWHITE);
     label->SetBackgroundColor(SkColorSetARGB(0, 255, 255, 255));
   }
 }
 
-// TODO(yiyix): Instead of using a fixed padding beside each tray item, take
-// internal icon padding into account when adjusting tray icon spacing. See
-// crbug.com/653292.
 void SetTrayImageItemBorder(views::View* tray_view, ShelfAlignment alignment) {
+  if (MaterialDesignController::IsShelfMaterial())
+    return;
+
   const int tray_image_item_padding = GetTrayConstant(TRAY_IMAGE_ITEM_PADDING);
   if (IsHorizontalAlignment(alignment)) {
     tray_view->SetBorder(views::Border::CreateEmptyBorder(
         0, tray_image_item_padding, 0, tray_image_item_padding));
   } else {
     tray_view->SetBorder(views::Border::CreateEmptyBorder(
         tray_image_item_padding,
         kTrayImageItemHorizontalPaddingVerticalAlignment,
         tray_image_item_padding,
         kTrayImageItemHorizontalPaddingVerticalAlignment));
   }
 }
 
 void SetTrayLabelItemBorder(TrayItemView* tray_view, ShelfAlignment alignment) {
+  if (MaterialDesignController::IsShelfMaterial())
+    return;
+
   if (IsHorizontalAlignment(alignment)) {
     tray_view->SetBorder(views::Border::CreateEmptyBorder(
         0, kTrayLabelItemHorizontalPaddingBottomAlignment, 0,
         kTrayLabelItemHorizontalPaddingBottomAlignment));
   } else {
     // Center the label for vertical launcher alignment.
     int horizontal_padding =
         std::max(0, (tray_view->GetPreferredSize().width() -
                      tray_view->label()->GetPreferredSize().width()) /
                         2);
@@ skipping 23 matching lines @@
 bool CanOpenWebUISettings(LoginStatus status) {
   // TODO(tdanderson): Consider moving this into WmShell, or introduce a
   // CanShowSettings() method in each delegate type that has a
   // ShowSettings() method.
   return status != LoginStatus::NOT_LOGGED_IN &&
          status != LoginStatus::LOCKED &&
          !WmShell::Get()->GetSessionStateDelegate()->IsInSecondaryLoginScreen();
 }
 
 }  // namespace ash