mash: Migrate ShelfButton* 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"
 
 namespace gfx {
 class Rect;
 }
 
 namespace ui {
 class GestureEvent;
 class MouseEvent;
 }
 
 namespace ash {
 
 class ShelfLockingManager;
+class ShelfView;
 class WmShelfObserver;
 class WmWindow;
 
 // 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;
@@ skipping 53 matching lines @@
   virtual void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) = 0;
   virtual void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) = 0;
 
   virtual void AddObserver(WmShelfObserver* observer) = 0;
   virtual void RemoveObserver(WmShelfObserver* observer) = 0;
 
   // Simulates a virtual keyboard bounds update.
   virtual void SetKeyboardBoundsForTesting(const gfx::Rect& bounds) = 0;
 
   virtual ShelfLockingManager* GetShelfLockingManagerForTesting() = 0;
+  virtual ShelfView* GetShelfViewForTesting() = 0;

[James Cook, 2016/07/27 19:43:00]

I did this because I wanted to move the unit test with the code it tests, and I
didn't want to introduce a WmShelfTestApi since (a) WmShelfAura doesn't have
access to ShelfView and (b) I'm not yet sure how unit tests will work after the
mus flip.

[msw, 2016/07/27 20:12:34]

Acknowledged.

 
  protected:
   virtual ~WmShelf() {}
 };
 
 }  // namespace ash
 
 #endif  // ASH_COMMON_SHELF_WM_SHELF_H_