Clean up some ash constants.

ash/system/tray/tray_background_view.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/system/tray/tray_background_view.h"
 
 #include <algorithm>
 
 #include "ash/ash_constants.h"
 #include "ash/shelf/shelf_constants.h"
@@ skipping 460 matching lines @@
   // In the given |canvas|, for a horizontal shelf draw a separator line to the
   // right or left of the TrayBackgroundView when the system is LTR or RTL
   // aligned, respectively. For a vertical shelf draw the separator line
   // underneath the items instead.
   const gfx::Rect local_bounds = GetLocalBounds();
   const SkColor color = SkColorSetA(SK_ColorWHITE, 0x4D);
 
   if (IsHorizontalAlignment(shelf_alignment_)) {
     const gfx::PointF point(
         base::i18n::IsRTL() ? 0 : (local_bounds.width() - kSeparatorWidth),
-        (GetShelfConstant(SHELF_SIZE) - kTrayItemSize) / 2);
+        (kShelfSize - kTrayItemSize) / 2);
     const gfx::Vector2dF vector(0, kTrayItemSize);
     canvas->Draw1pxLine(point, point + vector, color);
   } else {
-    const gfx::PointF point((GetShelfConstant(SHELF_SIZE) - kTrayItemSize) / 2,
+    const gfx::PointF point((kShelfSize - kTrayItemSize) / 2,
                             local_bounds.height() - kSeparatorWidth);
     const gfx::Vector2dF vector(kTrayItemSize, 0);
     canvas->Draw1pxLine(point, point + vector, color);
   }
 }
 
 gfx::Insets TrayBackgroundView::GetBackgroundInsets() const {
   gfx::Insets insets = GetMirroredBackgroundInsets(shelf_alignment_);
 
   // |insets| are relative to contents bounds. Change them to be relative to
   // local bounds.
   gfx::Insets local_contents_insets =
       GetLocalBounds().InsetsFrom(GetContentsBounds());
   MirrorInsetsIfNecessary(&local_contents_insets);
   insets += local_contents_insets;
 
   return insets;
 }
 
 gfx::Rect TrayBackgroundView::GetBackgroundBounds() const {
   gfx::Insets insets = GetBackgroundInsets();
   gfx::Rect bounds = GetLocalBounds();
   bounds.Inset(insets);
   return bounds;
 }
 
 }  // namespace ash