mash: Use wm::WmSnapToPixelLayoutManager for the shelf.

ash/shelf/shelf_layout_manager.h

 // Copyright 2012 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_SHELF_SHELF_LAYOUT_MANAGER_H_
 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
 #include "ash/common/session/session_state_observer.h"
 #include "ash/common/shelf/shelf_types.h"
 #include "ash/common/shell_observer.h"
 #include "ash/common/wm/background_animator.h"
 #include "ash/common/wm/dock/docked_window_layout_manager_observer.h"
 #include "ash/common/wm/lock_state_observer.h"
+#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_types.h"
 #include "ash/common/wm_activation_observer.h"
 #include "ash/shelf/shelf_widget.h"
-#include "ash/snap_to_pixel_layout_manager.h"
 #include "ash/wm/gestures/shelf_gesture_handler.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
 namespace ui {
 class ImplicitAnimationObserver;
@@ skipping 14 matching lines @@
 // layout to the status area.
 // To respond to bounds changes in the status area StatusAreaLayoutManager works
 // closely with ShelfLayoutManager.
 // On mus, widget bounds management is handled by the window manager.
 class ASH_EXPORT ShelfLayoutManager
     : public ShellObserver,
       public WmActivationObserver,
       public DockedWindowLayoutManagerObserver,
       public keyboard::KeyboardControllerObserver,
       public LockStateObserver,
-      public SnapToPixelLayoutManager,
+      public wm::WmSnapToPixelLayoutManager,
       public SessionStateObserver {
  public:
   explicit ShelfLayoutManager(ShelfWidget* shelf_widget);
   ~ShelfLayoutManager() override;
 
   void set_workspace_controller(WorkspaceController* controller) {
     workspace_controller_ = controller;
   }
 
   bool updating_bounds() const { return updating_bounds_; }
@@ skipping 58 matching lines @@
   void OnGestureEdgeSwipe(const ui::GestureEvent& gesture);
   void StartGestureDrag(const ui::GestureEvent& gesture);
   void UpdateGestureDrag(const ui::GestureEvent& gesture);
   void CompleteGestureDrag(const ui::GestureEvent& gesture);
   void CancelGestureDrag();
 
   // Set an animation duration override for the show / hide animation of the
   // shelf. Specifying 0 leads to use the default.
   void SetAnimationDurationOverride(int duration_override_in_ms);
 
-  // Overridden from SnapLayoutManager:
+  // Overridden from wm::WmSnapToPixelLayoutManager:
   void OnWindowResized() override;
-  void SetChildBounds(aura::Window* child,
+  void SetChildBounds(WmWindow* child,
                       const gfx::Rect& requested_bounds) override;
 
   // Overridden from ShellObserver:
   void OnLockStateChanged(bool locked) override;
   void OnShelfAlignmentChanged(WmWindow* root_window) override;
   void OnShelfAutoHideBehaviorChanged(WmWindow* root_window) override;
   void OnPinnedStateChanged(WmWindow* pinned_window) override;
 
   // Overridden from WmActivationObserver:
   void OnWindowActivated(WmWindow* gained_active,
@@ skipping 226 matching lines @@
 
   std::unique_ptr<RootWindowControllerObserverImpl>
       root_window_controller_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_