mash: Convert AshPopupAlignmentDelegate to wm common types

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 11 matching lines @@
  public:
   // Returns the window showing the shelf.
   virtual WmWindow* GetWindow() = 0;
 
   virtual ShelfAlignment GetAlignment() const = 0;
   virtual void SetAlignment(ShelfAlignment alignment) = 0;
 
   virtual ShelfAutoHideBehavior GetAutoHideBehavior() const = 0;
   virtual void SetAutoHideBehavior(ShelfAutoHideBehavior behavior) = 0;
 
+  virtual ShelfAutoHideState GetAutoHideState() const = 0;
+
   virtual ShelfBackgroundType GetBackgroundType() const = 0;
 
   virtual void UpdateVisibilityState() = 0;
 
   virtual ShelfVisibilityState GetVisibilityState() const = 0;
 
+  virtual gfx::Rect GetUserWorkAreaBounds() const = 0;
+
   virtual void UpdateIconPositionForWindow(WmWindow* window) = 0;
 
   // 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.
   virtual gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) = 0;
 
   virtual void AddObserver(WmShelfObserver* observer) = 0;
   virtual void RemoveObserver(WmShelfObserver* observer) = 0;
 
  protected:
   virtual ~WmShelf() {}
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_WM_SHELF_H_