mash: Move ash/common/wm/shelf to ash/common/shelf

ash/common/wm/dock/docked_window_layout_manager.h

Index: ash/common/wm/dock/docked_window_layout_manager.h
diff --git a/ash/common/wm/dock/docked_window_layout_manager.h b/ash/common/wm/dock/docked_window_layout_manager.h
index 99b86fd880eb50326890ed12c2509b66cf0a0d6d..c40c71a8f2a9f7cb169384ab21e430bf1e16f742 100644
--- a/ash/common/wm/dock/docked_window_layout_manager.h
+++ b/ash/common/wm/dock/docked_window_layout_manager.h
@@ -27,10 +27,10 @@ class DockedBackgroundWidget;
 class DockedWindowLayoutManagerObserver;
 class DockedWindowResizerTest;
 class Shelf;
+class WmShelf;
 
 namespace wm {
 class WmRootWindowController;
-class WmShelf;
 }
 
 // DockedWindowLayoutManager is responsible for organizing windows when they are
@@ -93,8 +93,8 @@ class ASH_EXPORT DockedWindowLayoutManager
   // the current shelf alignment conflicts. Never clears the |alignment_|.
   void MaybeSetDesiredDockedAlignment(DockedAlignment alignment);
 
-  wm::WmShelf* shelf() { return shelf_; }
-  void SetShelf(wm::WmShelf* shelf);
+  WmShelf* shelf() { return shelf_; }
+  void SetShelf(WmShelf* shelf);
 
   // Calculates if a window is touching the screen edges and returns edge.
   DockedAlignment GetAlignmentOfWindow(const wm::WmWindow* window) const;
@@ -268,7 +268,7 @@ class ASH_EXPORT DockedWindowLayoutManager
   bool is_dragged_from_dock_;
 
   // The shelf to respond to alignment changes.
-  wm::WmShelf* shelf_;
+  WmShelf* shelf_;
 
   // Tracks if any window in the same root window is in fullscreen mode.
   bool in_fullscreen_;