Clean up some ash constants.

ash/shelf/shelf_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/shelf/shelf_view.h"
 
 #include <algorithm>
 #include <memory>
 
 #include "ash/ash_constants.h"
@@ skipping 1324 matching lines @@
     gfx::Rect last_button_bounds =
         view_model_->view_at(last_button_index)->bounds();
     if (overflow_button_->visible() &&
         model_->GetItemIndexForType(TYPE_APP_PANEL) == -1) {
       // When overflow button is visible and shelf has no panel items,
       // last_button_bounds should be overflow button's bounds.
       last_button_bounds = overflow_button_->bounds();
     }
 
     if (wm_shelf_->IsHorizontalAlignment()) {
-      preferred_size =
-          gfx::Size(last_button_bounds.right(), GetShelfConstant(SHELF_SIZE));
+      preferred_size = gfx::Size(last_button_bounds.right(), kShelfSize);
     } else {
-      preferred_size =
-          gfx::Size(GetShelfConstant(SHELF_SIZE), last_button_bounds.bottom());
+      preferred_size = gfx::Size(kShelfSize, last_button_bounds.bottom());
     }
   }
   gfx::Point origin(GetMirroredXWithWidthInView(0, preferred_size.width()), 0);
 
   // In overflow mode, we should use OverflowBubbleView as a source for
   // converting |origin| to screen coordinates. When a scroll operation is
   // occurred in OverflowBubble, the bounds of ShelfView in OverflowBubble can
   // be changed.
   if (is_overflow_mode())
     ConvertPointToScreen(owner_overflow_bubble_->bubble_view(), &origin);
@@ skipping 28 matching lines @@
   // If the modified view will be at the end of the list, return the new end of
   // the list.
   if (at_end)
     return view_model_->view_size();
   return modified_view ? view_model_->GetIndexOfView(modified_view) : -1;
 }
 
 gfx::Size ShelfView::GetPreferredSize() const {
   gfx::Rect overflow_bounds;
   CalculateIdealBounds(&overflow_bounds);
-  const int shelf_size = GetShelfConstant(SHELF_SIZE);
 
   int last_button_index = last_visible_index_;
   if (!is_overflow_mode()) {
     if (last_hidden_index_ < view_model_->view_size() - 1)
       last_button_index = view_model_->view_size() - 1;
     else if (overflow_button_ && overflow_button_->visible())
       last_button_index++;
   }
 
   // When an item is dragged off from the overflow bubble, it is moved to last
   // position and and changed to invisible. Overflow bubble size should be
   // shrunk to fit only for visible items.
   // If |dragged_off_from_overflow_to_shelf_| is set, there will be no invisible
   // items in the shelf.
   if (is_overflow_mode() && dragged_off_shelf_ &&
       !dragged_off_from_overflow_to_shelf_ &&
       RemovableByRipOff(view_model_->GetIndexOfView(drag_view_)) == REMOVABLE)
     last_button_index--;
 
   const gfx::Rect last_button_bounds =
       last_button_index >= first_visible_index_
           ? view_model_->ideal_bounds(last_button_index)
-          : gfx::Rect(gfx::Size(shelf_size, shelf_size));
+          : gfx::Rect(gfx::Size(kShelfSize, kShelfSize));
 
   if (wm_shelf_->IsHorizontalAlignment())
-    return gfx::Size(last_button_bounds.right(), shelf_size);
+    return gfx::Size(last_button_bounds.right(), kShelfSize);
 
-  return gfx::Size(shelf_size, last_button_bounds.bottom());
+  return gfx::Size(kShelfSize, last_button_bounds.bottom());
 }
 
 void ShelfView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
   // This bounds change is produced by the shelf movement and all content has
   // to follow. Using an animation at that time would produce a time lag since
   // the animation of the BoundsAnimator has itself a delay before it arrives
   // at the required location. As such we tell the animator to go there
   // immediately.
   BoundsAnimatorDisabler disabler(bounds_animator_.get());
   LayoutToIdealBounds();
@@ skipping 324 matching lines @@
 
 int ShelfView::CalculateShelfDistance(const gfx::Point& coordinate) const {
   const gfx::Rect bounds = GetBoundsInScreen();
   int distance = wm_shelf_->SelectValueForShelfAlignment(
       bounds.y() - coordinate.y(), coordinate.x() - bounds.right(),
       bounds.x() - coordinate.x());
   return distance > 0 ? distance : 0;
 }
 
 }  // namespace ash