Revert of Shelf Cleanup (- binary files)

ash/shelf/shelf_layout_manager.h

Index: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index 721b16d63f30ad9bfb9bf202fd45ad4f89f7430e..861b25b90d82df241f3430cd519d46b18de90160 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -77,9 +77,17 @@
   // Size of the shelf when auto-hidden.
   static const int kAutoHideSize;
 
+  // The size of the shelf when shown (currently only used in alternate
+  // settings see ash::switches::UseAlternateShelfLayout).
+  static const int kShelfSize;
+
   // Inset between the inner edge of the shelf (towards centre of screen), and
   // the shelf items, notifications, status area etc.
   static const int kShelfItemInset;
+
+  // Returns the preferred size for the shelf (either kShelfPreferredSize or
+  // kShelfSize).
+  static int GetPreferredShelfSize();
 
   explicit ShelfLayoutManager(ShelfWidget* shelf);
   virtual ~ShelfLayoutManager();