Moves mash/wm into ash/mus

ash/mus/bridge/wm_shelf_mus.cc

Index: ash/mus/bridge/wm_shelf_mus.cc
diff --git a/mash/wm/bridge/wm_shelf_mus.cc b/ash/mus/bridge/wm_shelf_mus.cc
similarity index 42%
rename from mash/wm/bridge/wm_shelf_mus.cc
rename to ash/mus/bridge/wm_shelf_mus.cc
index 280516c817fd03e7b008d6726b8c3d38d34aac31..d18c2bc0a6bb4b3c9806c1af6269118639329758 100644
--- a/mash/wm/bridge/wm_shelf_mus.cc
+++ b/ash/mus/bridge/wm_shelf_mus.cc
@@ -2,73 +2,71 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mash/wm/bridge/wm_shelf_mus.h"
+#include "ash/mus/bridge/wm_shelf_mus.h"
 
+#include "ash/mus/bridge/wm_window_mus.h"
+#include "ash/mus/shelf_layout_manager.h"
 #include "components/mus/public/cpp/window.h"
-#include "mash/wm/bridge/wm_window_mus.h"
-#include "mash/wm/shelf_layout_manager.h"
 
 // TODO(sky): fully implement this http://crbug.com/612631 .
 #undef NOTIMPLEMENTED
 #define NOTIMPLEMENTED() DVLOG(1) << "notimplemented"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 WmShelfMus::WmShelfMus(ShelfLayoutManager* shelf_layout_manager)
     : shelf_layout_manager_(shelf_layout_manager) {}
 
 WmShelfMus::~WmShelfMus() {}
 
-ash::wm::WmWindow* WmShelfMus::GetWindow() {
+wm::WmWindow* WmShelfMus::GetWindow() {
   return WmWindowMus::Get(shelf_layout_manager_->GetShelfWindow());
 }
 
-ash::wm::ShelfAlignment WmShelfMus::GetAlignment() const {
+wm::ShelfAlignment WmShelfMus::GetAlignment() const {
   switch (shelf_layout_manager_->alignment()) {
-    case shelf::mojom::Alignment::BOTTOM:
-      return ash::wm::SHELF_ALIGNMENT_BOTTOM;
-    case shelf::mojom::Alignment::LEFT:
-      return ash::wm::SHELF_ALIGNMENT_LEFT;
-    case shelf::mojom::Alignment::RIGHT:
-      return ash::wm::SHELF_ALIGNMENT_RIGHT;
+    case mash::shelf::mojom::Alignment::BOTTOM:
+      return wm::SHELF_ALIGNMENT_BOTTOM;
+    case mash::shelf::mojom::Alignment::LEFT:
+      return wm::SHELF_ALIGNMENT_LEFT;
+    case mash::shelf::mojom::Alignment::RIGHT:
+      return wm::SHELF_ALIGNMENT_RIGHT;
   }
   NOTREACHED();
-  return ash::wm::SHELF_ALIGNMENT_BOTTOM;
+  return wm::SHELF_ALIGNMENT_BOTTOM;
 }
 
-ash::wm::ShelfBackgroundType WmShelfMus::GetBackgroundType() const {
+wm::ShelfBackgroundType WmShelfMus::GetBackgroundType() const {
   NOTIMPLEMENTED();
-  return ash::wm::SHELF_BACKGROUND_DEFAULT;
+  return wm::SHELF_BACKGROUND_DEFAULT;
 }
 
 void WmShelfMus::UpdateVisibilityState() {
   NOTIMPLEMENTED();
 }
 
-ash::ShelfVisibilityState WmShelfMus::GetVisibilityState() const {
+ShelfVisibilityState WmShelfMus::GetVisibilityState() const {
   NOTIMPLEMENTED();
-  return shelf_layout_manager_->GetShelfWindow() ? ash::SHELF_VISIBLE
-                                                 : ash::SHELF_HIDDEN;
+  return shelf_layout_manager_->GetShelfWindow() ? SHELF_VISIBLE : SHELF_HIDDEN;
 }
 
-void WmShelfMus::UpdateIconPositionForWindow(ash::wm::WmWindow* window) {
+void WmShelfMus::UpdateIconPositionForWindow(wm::WmWindow* window) {
   NOTIMPLEMENTED();
 }
 
-gfx::Rect WmShelfMus::GetScreenBoundsOfItemIconForWindow(
-    ash::wm::WmWindow* window) {
+gfx::Rect WmShelfMus::GetScreenBoundsOfItemIconForWindow(wm::WmWindow* window) {
   NOTIMPLEMENTED();
   return gfx::Rect();
 }
 
-void WmShelfMus::AddObserver(ash::wm::WmShelfObserver* observer) {
+void WmShelfMus::AddObserver(wm::WmShelfObserver* observer) {
   observers_.AddObserver(observer);
 }
 
-void WmShelfMus::RemoveObserver(ash::wm::WmShelfObserver* observer) {
+void WmShelfMus::RemoveObserver(wm::WmShelfObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash