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

ash/common/shelf/wm_shelf.h

 // Copyright 2016 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.
 
 #ifndef ASH_COMMON_SHELF_WM_SHELF_H_
 #define ASH_COMMON_SHELF_WM_SHELF_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/shelf/shelf_types.h"
 
@@ skipping 15 matching lines @@
 
 // Used for accessing global state.
 class ASH_EXPORT WmShelf {
  public:
   // Returns the window showing the shelf.
   virtual WmWindow* GetWindow() = 0;
 
   virtual ShelfAlignment GetAlignment() const = 0;
   virtual void SetAlignment(ShelfAlignment alignment) = 0;
 
+  // Returns true if the shelf alignment is horizontal (i.e. at the bottom).
+  bool IsHorizontalAlignment() const;
+
+  // Returns a value based on shelf alignment.
+  int SelectValueForShelfAlignment(int bottom, int left, int right) const;
+
+  // Returns |horizontal| is shelf is horizontal, otherwise |vertical|.
+  int PrimaryAxisValue(int horizontal, int vertical) const;
+
   virtual ShelfAutoHideBehavior GetAutoHideBehavior() const = 0;
   virtual void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) = 0;
 
   virtual ShelfAutoHideState GetAutoHideState() const = 0;
 
   // Invoke when the auto-hide state may have changed (for example, when the
   // system tray bubble opens it should force the shelf to be visible).
   virtual void UpdateAutoHideState() = 0;
 
   virtual ShelfBackgroundType GetBackgroundType() const = 0;
@@ skipping 49 matching lines @@
   virtual ShelfLockingManager* GetShelfLockingManagerForTesting() = 0;
   virtual ShelfView* GetShelfViewForTesting() = 0;
 
  protected:
   virtual ~WmShelf() {}
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_WM_SHELF_H_