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

ash/aura/wm_shelf_aura.cc

Index: ash/aura/wm_shelf_aura.cc
diff --git a/ash/aura/wm_shelf_aura.cc b/ash/aura/wm_shelf_aura.cc
index 949cc00f9a7d61367d274440609245b29a1199af..2a4ddf5a21aa14a2ff43e7b9061847c6ba68a9c0 100644
--- a/ash/aura/wm_shelf_aura.cc
+++ b/ash/aura/wm_shelf_aura.cc
@@ -5,14 +5,13 @@
 #include "ash/aura/wm_shelf_aura.h"
 
 #include "ash/aura/wm_window_aura.h"
-#include "ash/common/wm/shelf/wm_shelf_observer.h"
+#include "ash/common/shelf/wm_shelf_observer.h"
 #include "ash/common/wm_window.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
-namespace wm {
 
 WmShelfAura::WmShelfAura(Shelf* shelf)
     : shelf_(shelf), shelf_layout_manager_(shelf->shelf_layout_manager()) {
@@ -75,7 +74,7 @@ void WmShelfAura::WillDeleteShelfLayoutManager() {
 }
 
 void WmShelfAura::OnBackgroundUpdated(
-    wm::ShelfBackgroundType background_type,
+    ShelfBackgroundType background_type,
     BackgroundAnimatorChangeType change_type) {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_,
                     OnBackgroundUpdated(background_type, change_type));
@@ -90,5 +89,4 @@ void WmShelfAura::OnShelfIconPositionsChanged() {
   FOR_EACH_OBSERVER(WmShelfObserver, observers_, OnShelfIconPositionsChanged());
 }
 
-}  // namespace wm
 }  // namespace ash