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

ash/common/wm_root_window_controller.h

Index: ash/common/wm_root_window_controller.h
diff --git a/ash/common/wm_root_window_controller.h b/ash/common/wm_root_window_controller.h
index cfcc8f3e781213155e98b10ff5a439e4508526a9..facf5699e80b777c790fe6d07af80b46ab20a26c 100644
--- a/ash/common/wm_root_window_controller.h
+++ b/ash/common/wm_root_window_controller.h
@@ -16,14 +16,11 @@ class Point;
 namespace ash {
 
 class AlwaysOnTopController;
+class WmShelf;
 class WmShell;
 class WmRootWindowControllerObserver;
 class WmWindow;
 
-namespace wm {
-class WmShelf;
-}
-
 // Provides state associated with a root of a window hierarchy.
 class ASH_EXPORT WmRootWindowController {
  public:
@@ -37,7 +34,7 @@ class ASH_EXPORT WmRootWindowController {
 
   virtual AlwaysOnTopController* GetAlwaysOnTopController() = 0;
 
-  virtual wm::WmShelf* GetShelf() = 0;
+  virtual WmShelf* GetShelf() = 0;
 
   // Returns the window associated with this WmRootWindowController.
   virtual WmWindow* GetWindow() = 0;