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

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..0a18f50aa6962b951ee48d5d3ada485cb61b8506 100644
--- a/ash/mus/bridge/wm_shelf_mus.cc
+++ b/ash/mus/bridge/wm_shelf_mus.cc
@@ -24,22 +24,22 @@ wm::WmWindow* WmShelfMus::GetWindow() {
   return WmWindowMus::Get(shelf_layout_manager_->GetShelfWindow());
 }
 
-wm::ShelfAlignment WmShelfMus::GetAlignment() const {
+ShelfAlignment WmShelfMus::GetAlignment() const {
   switch (shelf_layout_manager_->alignment()) {
     case mash::shelf::mojom::Alignment::BOTTOM:
-      return wm::SHELF_ALIGNMENT_BOTTOM;
+      return SHELF_ALIGNMENT_BOTTOM;
     case mash::shelf::mojom::Alignment::LEFT:
-      return wm::SHELF_ALIGNMENT_LEFT;
+      return SHELF_ALIGNMENT_LEFT;
     case mash::shelf::mojom::Alignment::RIGHT:
-      return wm::SHELF_ALIGNMENT_RIGHT;
+      return SHELF_ALIGNMENT_RIGHT;
   }
   NOTREACHED();
-  return wm::SHELF_ALIGNMENT_BOTTOM;
+  return SHELF_ALIGNMENT_BOTTOM;
 }
 
-wm::ShelfBackgroundType WmShelfMus::GetBackgroundType() const {
+ShelfBackgroundType WmShelfMus::GetBackgroundType() const {
   NOTIMPLEMENTED();
-  return wm::SHELF_BACKGROUND_DEFAULT;
+  return SHELF_BACKGROUND_DEFAULT;
 }
 
 void WmShelfMus::UpdateVisibilityState() {
@@ -60,11 +60,11 @@ gfx::Rect WmShelfMus::GetScreenBoundsOfItemIconForWindow(wm::WmWindow* window) {
   return gfx::Rect();
 }
 
-void WmShelfMus::AddObserver(wm::WmShelfObserver* observer) {
+void WmShelfMus::AddObserver(WmShelfObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void WmShelfMus::RemoveObserver(wm::WmShelfObserver* observer) {
+void WmShelfMus::RemoveObserver(WmShelfObserver* observer) {
   observers_.RemoveObserver(observer);
 }