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 78%
rename from ash/common/wm/shelf/wm_shelf.h
rename to ash/common/shelf/wm_shelf.h
index dcc8f0b68651cfc35521cedfc841139218f738ae..bc883ebf209153fcc9f2831fd63decdc90b8c3a0 100644
--- a/ash/common/wm/shelf/wm_shelf.h
+++ b/ash/common/shelf/wm_shelf.h
@@ -2,27 +2,28 @@
 // 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;
 }
 
 namespace ash {
-namespace wm {
-
 class WmShelfObserver;
+
+namespace wm {
 class WmWindow;
+}
 
 // Used for accessing global state.
 class ASH_EXPORT WmShelf {
  public:
   // Returns the window showing the shelf.
-  virtual WmWindow* GetWindow() = 0;
+  virtual wm::WmWindow* GetWindow() = 0;
 
   virtual ShelfAlignment GetAlignment() const = 0;
 
@@ -32,7 +33,7 @@ class ASH_EXPORT WmShelf {
 
   virtual ShelfVisibilityState GetVisibilityState() const = 0;
 
-  virtual void UpdateIconPositionForWindow(WmWindow* window) = 0;
+  virtual void UpdateIconPositionForWindow(wm::WmWindow* window) = 0;
 
   // Returns the screen bounds of the item for the specified window. If there is
   // no item for the specified window an empty rect is returned.
@@ -46,7 +47,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_