Shuffles and renames ash/common/wm classes

ash/aura/wm_shelf_aura.h

Index: ash/aura/wm_shelf_aura.h
diff --git a/ash/wm/aura/wm_shelf_aura.h b/ash/aura/wm_shelf_aura.h
similarity index 90%
rename from ash/wm/aura/wm_shelf_aura.h
rename to ash/aura/wm_shelf_aura.h
index e078e418b419f0f0cc4c5b3f21bacc1e4ac239e2..ec28a7ce220de6c4068387bb5e3c746a5994ab6a 100644
--- a/ash/wm/aura/wm_shelf_aura.h
+++ b/ash/aura/wm_shelf_aura.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ASH_WM_AURA_WM_SHELF_AURA_H_
-#define ASH_WM_AURA_WM_SHELF_AURA_H_
+#ifndef ASH_AURA_WM_SHELF_AURA_H_
+#define ASH_AURA_WM_SHELF_AURA_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/wm/shelf/wm_shelf.h"
@@ -37,7 +37,7 @@ class ASH_EXPORT WmShelfAura : public WmShelf,
   void UpdateVisibilityState() override;
   ShelfVisibilityState GetVisibilityState() const override;
   void UpdateIconPositionForWindow(WmWindow* window) override;
-  gfx::Rect GetScreenBoundsOfItemIconForWindow(wm::WmWindow* window) override;
+  gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
   void AddObserver(WmShelfObserver* observer) override;
   void RemoveObserver(WmShelfObserver* observer) override;
 
@@ -62,4 +62,4 @@ class ASH_EXPORT WmShelfAura : public WmShelf,
 }  // namespace wm
 }  // namespace ash
 
-#endif  // ASH_WM_AURA_WM_SHELF_AURA_H_
+#endif  // ASH_AURA_WM_SHELF_AURA_H_