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

ash/common/shelf/wm_shelf.h

Index: ash/common/shelf/wm_shelf.h
diff --git a/ash/common/wm/shelf/wm_shelf.h b/ash/common/shelf/wm_shelf.h
similarity index 84%
rename from ash/common/wm/shelf/wm_shelf.h
rename to ash/common/shelf/wm_shelf.h
index df0bc3e6e9ea3649e501871bc78c5eee69887d5c..ca0aef770ceab01bb7fb1e9a96e6d3d7e7cf73b7 100644
--- a/ash/common/wm/shelf/wm_shelf.h
+++ b/ash/common/shelf/wm_shelf.h
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_COMMON_WM_SHELF_WM_SHELF_H_
-#define ASH_COMMON_WM_SHELF_WM_SHELF_H_
+#ifndef ASH_COMMON_SHELF_WM_SHELF_H_
+#define ASH_COMMON_SHELF_WM_SHELF_H_
 
 #include "ash/ash_export.h"
-#include "ash/common/wm/shelf/wm_shelf_types.h"
+#include "ash/common/shelf/shelf_types.h"
 
 namespace gfx {
 class Rect;
@@ -14,11 +14,8 @@ class Rect;
 
 namespace ash {
 
-class WmWindow;
-
-namespace wm {
-
 class WmShelfObserver;
+class WmWindow;
 
 // Used for accessing global state.
 class ASH_EXPORT WmShelf {
@@ -47,7 +44,6 @@ class ASH_EXPORT WmShelf {
   virtual ~WmShelf() {}
 };
 
-}  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_COMMON_WM_SHELF_WM_SHELF_H_
+#endif  // ASH_COMMON_SHELF_WM_SHELF_H_