Revert of Shelf Cleanup (- binary files)

ash/shelf/shelf_view.h

Index: ash/shelf/shelf_view.h
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
index ccf6ffcc07a7194262e340f3c5fcfd2f9f8cffd5..6cd44e01af3cc6ccaeaedb306f0301ce6de470a4 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -235,6 +235,11 @@
   // Toggles the overflow menu.
   void ToggleOverflowBubble();
 
+  // Update first launcher button's padding. This method adds padding to the
+  // first button to include the leading inset. It needs to be called once on
+  // button creation and every time when shelf alignment is changed.
+  void UpdateFirstButtonPadding();
+
   // Invoked after the fading out animation for item deletion is ended.
   void OnFadeOutAnimationEnded();
 
@@ -243,6 +248,12 @@
 
   // Updates the visible range of overflow items in |overflow_view|.
   void UpdateOverflowRange(ShelfView* overflow_view);
+
+  // Returns the launcher button size.
+  int GetButtonSize() const;
+
+  // Returns the button spacing.
+  int GetButtonSpacing() const;
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;