mash: Use wm::WmSnapToPixelLayoutManager for the shelf.

ash/wm/status_area_layout_manager.h

Index: ash/wm/status_area_layout_manager.h
diff --git a/ash/wm/status_area_layout_manager.h b/ash/wm/status_area_layout_manager.h
index 77a844d2778bbc05e58bef25b09e3a8a5ec3bb25..9d276ae5731205f3ed1e295d33c731093cb907ab 100644
--- a/ash/wm/status_area_layout_manager.h
+++ b/ash/wm/status_area_layout_manager.h
@@ -5,25 +5,24 @@
 #ifndef ASH_WM_STATUS_AREA_LAYOUT_MANAGER_H_
 #define ASH_WM_STATUS_AREA_LAYOUT_MANAGER_H_
 
-#include "ash/snap_to_pixel_layout_manager.h"
-#include "base/compiler_specific.h"
+#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
 #include "base/macros.h"
-#include "ui/aura/layout_manager.h"
 
 namespace ash {
+
 class ShelfWidget;
 
 // StatusAreaLayoutManager is a layout manager responsible for the status area.
 // In any case when status area needs relayout it redirects this call to
 // ShelfLayoutManager.
-class StatusAreaLayoutManager : public SnapToPixelLayoutManager {
+class StatusAreaLayoutManager : public wm::WmSnapToPixelLayoutManager {
  public:
-  StatusAreaLayoutManager(aura::Window* container, ShelfWidget* shelf);
+  explicit StatusAreaLayoutManager(ShelfWidget* shelf_widget);
   ~StatusAreaLayoutManager() override;
 
-  // Overridden from aura::LayoutManager:
+  // Overridden from wm::WmSnapToPixelLayoutManager:
   void OnWindowResized() override;
-  void SetChildBounds(aura::Window* child,
+  void SetChildBounds(WmWindow* child,
                       const gfx::Rect& requested_bounds) override;
 
  private:
@@ -35,7 +34,7 @@ class StatusAreaLayoutManager : public SnapToPixelLayoutManager {
   // Used to prevent calling itself again from SetChildBounds().
   bool in_layout_;
 
-  ShelfWidget* shelf_;
+  ShelfWidget* shelf_widget_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusAreaLayoutManager);
 };