Shuffles and renames ash/common/wm classes

ash/mus/bridge/wm_shelf_mus.cc

Index: ash/mus/bridge/wm_shelf_mus.cc
diff --git a/ash/mus/bridge/wm_shelf_mus.cc b/ash/mus/bridge/wm_shelf_mus.cc
index d18c2bc0a6bb4b3c9806c1af6269118639329758..7ca80f279ec5b0630aa25d60456bf26dc312e4ae 100644
--- a/ash/mus/bridge/wm_shelf_mus.cc
+++ b/ash/mus/bridge/wm_shelf_mus.cc
@@ -20,7 +20,7 @@ WmShelfMus::WmShelfMus(ShelfLayoutManager* shelf_layout_manager)
 
 WmShelfMus::~WmShelfMus() {}
 
-wm::WmWindow* WmShelfMus::GetWindow() {
+WmWindow* WmShelfMus::GetWindow() {
   return WmWindowMus::Get(shelf_layout_manager_->GetShelfWindow());
 }
 
@@ -51,11 +51,11 @@ ShelfVisibilityState WmShelfMus::GetVisibilityState() const {
   return shelf_layout_manager_->GetShelfWindow() ? SHELF_VISIBLE : SHELF_HIDDEN;
 }
 
-void WmShelfMus::UpdateIconPositionForWindow(wm::WmWindow* window) {
+void WmShelfMus::UpdateIconPositionForWindow(WmWindow* window) {
   NOTIMPLEMENTED();
 }
 
-gfx::Rect WmShelfMus::GetScreenBoundsOfItemIconForWindow(wm::WmWindow* window) {
+gfx::Rect WmShelfMus::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
   NOTIMPLEMENTED();
   return gfx::Rect();
 }