Consolidate some more ash tray constants.

ash/common/system/status_area_widget_delegate.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/status_area_widget_delegate.h"
 
 #include "ash/common/focus_cycler.h"
 #include "ash/common/shelf/shelf_constants.h"
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shelf/wm_shelf_util.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/wm_lookup.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
 #include "ash/root_window_controller.h"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/animation/tween.h"
 #include "ui/views/accessible_pane_view.h"
 #include "ui/views/border.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace {
 
-const int kAnimationDurationMs = 250;
+constexpr int kAnimationDurationMs = 250;
+
+constexpr int kPaddingFromEdgeOfShelf = 3;
 
 class StatusAreaWidgetDelegateAnimationSettings
     : public ui::ScopedLayerAnimationSettings {
  public:
   explicit StatusAreaWidgetDelegateAnimationSettings(ui::Layer* layer)
       : ui::ScopedLayerAnimationSettings(layer->GetAnimator()) {
     SetTransitionDuration(
         base::TimeDelta::FromMilliseconds(kAnimationDurationMs));
     SetPreemptionStrategy(ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     SetTweenType(gfx::Tween::EASE_IN_OUT);
@@ skipping 138 matching lines @@
                                                 bool extend_border_to_edge) {
   // Tray views are laid out right-to-left or bottom-to-top.
   const bool horizontal_alignment = IsHorizontalAlignment(alignment_);
   const int padding = (GetShelfConstant(SHELF_SIZE) - kTrayItemSize) / 2;
 
   const int top_edge = horizontal_alignment ? padding : 0;
   const int left_edge = horizontal_alignment ? 0 : padding;
   const int bottom_edge =
       horizontal_alignment
           ? padding
-          : (extend_border_to_edge ? kTrayPaddingFromEdgeOfShelf : 0);
+          : (extend_border_to_edge ? kPaddingFromEdgeOfShelf : 0);
   const int right_edge =
       horizontal_alignment
-          ? (extend_border_to_edge ? kTrayPaddingFromEdgeOfShelf : 0)
+          ? (extend_border_to_edge ? kPaddingFromEdgeOfShelf : 0)
           : padding;
   child->SetBorder(
       views::CreateEmptyBorder(top_edge, left_edge, bottom_edge, right_edge));
 
   // Layout on |child| needs to be updated based on new border value before
   // displaying; otherwise |child| will be showing with old border size.
   // Fix for crbug.com/623438.
   child->Layout();
 }
 
 }  // namespace ash