Refactors DockedWindowLayoutManager in terms of ash/wm/common

ash/wm/dock/docked_window_layout_manager.h

 // Copyright (c) 2013 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_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
 #define ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_
 
 #include <memory>
 
 #include "ash/ash_export.h"
@@ skipping 12 matching lines @@
 #include "ui/keyboard/keyboard_controller_observer.h"
 
 namespace ash {
 class DockedBackgroundWidget;
 class DockedWindowLayoutManagerObserver;
 class DockedWindowResizerTest;
 class Shelf;
 
 namespace wm {
 class WmRootWindowController;
+class WmShelf;
 }
 
 // DockedWindowLayoutManager is responsible for organizing windows when they are
 // docked to the side of a screen. It is associated with a specific container
 // window (i.e. kShellWindowId_DockContainer) and controls the layout of any
 // windows added to that container.
 //
 // The constructor takes a |dock_container| argument which is expected to set
 // its layout manager to this instance, e.g.:
 // dock_container->SetLayoutManager(
@@ skipping 42 matching lines @@
   // Called by a DockedWindowResizer when a window is no longer being dragged.
   // Stops observing the window unless it is a child.
   // Records |action| by |source| in UMA.
   void FinishDragging(DockedAction action, DockedActionSource source);
 
   // Checks the rules and possibly updates the docked layout to match
   // the |alignment|. May not apply the |alignment| when
   // the current shelf alignment conflicts. Never clears the |alignment_|.
   void MaybeSetDesiredDockedAlignment(DockedAlignment alignment);
 
-  Shelf* shelf() { return shelf_; }
-  void SetShelf(Shelf* shelf);
+  wm::WmShelf* shelf() { return shelf_; }
+  void SetShelf(wm::WmShelf* shelf);
 
   // Calculates if a window is touching the screen edges and returns edge.
   DockedAlignment GetAlignmentOfWindow(const wm::WmWindow* window) const;
 
   // Used to snap docked windows to the side of screen during drag.
   DockedAlignment CalculateAlignment() const;
 
   void set_preferred_alignment(DockedAlignment preferred_alignment) {
     preferred_alignment_ = preferred_alignment;
   }
@@ skipping 153 matching lines @@
 
   // True if the window being dragged is currently docked.
   bool is_dragged_window_docked_;
 
   // Previously docked windows use a more relaxed dragging sorting algorithm
   // that uses assumption that a window starts being dragged out of position
   // that was previously established in Relayout. This allows easier reordering.
   bool is_dragged_from_dock_;
 
   // The shelf to respond to alignment changes.
-  Shelf* shelf_;
+  wm::WmShelf* shelf_;
 
   // Tracks if any window in the same root window is in fullscreen mode.
   bool in_fullscreen_;
   // Current width of the dock.
   int docked_width_;
 
   // Last bounds that were sent to observers.
   gfx::Rect docked_bounds_;
 
   // Target bounds of a docked window being dragged.
@@ skipping 24 matching lines @@
 
   // Observers of dock bounds changes.
   base::ObserverList<DockedWindowLayoutManagerObserver> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(DockedWindowLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_WM_DOCK_DOCKED_WINDOW_LAYOUT_MANAGER_H_