mash: Convert ShelfView to wm common types, clean up Shelf access

ash/shelf/shelf.h

Index: ash/shelf/shelf.h
diff --git a/ash/shelf/shelf.h b/ash/shelf/shelf.h
index 497c2b5490760afb722ce58f90219c4eb210a454..c22f451c853f097286db103dbb78a155933a2106 100644
--- a/ash/shelf/shelf.h
+++ b/ash/shelf/shelf.h
@@ -70,7 +70,6 @@ class ASH_EXPORT Shelf {
 
   void SetAlignment(ShelfAlignment alignment);
   ShelfAlignment alignment() const { return alignment_; }
-  bool IsHorizontalAlignment() const;
 
   // Sets the ShelfAutoHideBehavior. See enum description for details.
   void SetAutoHideBehavior(ShelfAutoHideBehavior auto_hide_behavior);
@@ -82,28 +81,6 @@ class ASH_EXPORT Shelf {
 
   ShelfVisibilityState GetVisibilityState() const;
 
-  // A helper functions that chooses values specific to a shelf alignment.
-  template <typename T>
-  T SelectValueForShelfAlignment(T bottom, T left, T right) const {
-    switch (alignment_) {
-      case SHELF_ALIGNMENT_BOTTOM:
-      case SHELF_ALIGNMENT_BOTTOM_LOCKED:
-        return bottom;
-      case SHELF_ALIGNMENT_LEFT:
-        return left;
-      case SHELF_ALIGNMENT_RIGHT:
-        return right;
-    }
-    NOTREACHED();
-    return right;
-  }
-
-  // A helper functions that chooses values specific to a shelf alignment type.
-  template <typename T>
-  T PrimaryAxisValue(T horizontal, T vertical) const {
-    return IsHorizontalAlignment() ? horizontal : vertical;
-  }
-
   // Returns the screen bounds of the item for the specified window. If there is
   // no item for the specified window an empty rect is returned.
   gfx::Rect GetScreenBoundsOfItemIconForWindow(const aura::Window* window);