Moves mash/wm into ash/mus

ash/mus/bridge/wm_shelf_mus.h

Index: ash/mus/bridge/wm_shelf_mus.h
diff --git a/mash/wm/bridge/wm_shelf_mus.h b/ash/mus/bridge/wm_shelf_mus.h
similarity index 42%
rename from mash/wm/bridge/wm_shelf_mus.h
rename to ash/mus/bridge/wm_shelf_mus.h
index 62a34a35f68aa8651d0974943f33a3c11c26193e..60549862ecf16f8dbd2ad6399a2bf6e60c3122b7 100644
--- a/mash/wm/bridge/wm_shelf_mus.h
+++ b/ash/mus/bridge/wm_shelf_mus.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 MASH_WM_BRIDGE_WM_SHELF_MUS_H_
-#define MASH_WM_BRIDGE_WM_SHELF_MUS_H_
+#ifndef ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
+#define ASH_MUS_BRIDGE_WM_SHELF_MUS_H_
 
 #include <stdint.h>
 
@@ -13,38 +13,37 @@
 #include "base/macros.h"
 #include "base/observer_list.h"
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class ShelfLayoutManager;
 
 // WmShelf implementation for mus.
-class WmShelfMus : public ash::wm::WmShelf {
+class WmShelfMus : public wm::WmShelf {
  public:
   explicit WmShelfMus(ShelfLayoutManager* shelf_layout_manager);
   ~WmShelfMus() override;
 
-  // ash::wm::WmShelf:
-  ash::wm::WmWindow* GetWindow() override;
-  ash::wm::ShelfAlignment GetAlignment() const override;
-  ash::wm::ShelfBackgroundType GetBackgroundType() const override;
+  // wm::WmShelf:
+  wm::WmWindow* GetWindow() override;
+  wm::ShelfAlignment GetAlignment() const override;
+  wm::ShelfBackgroundType GetBackgroundType() const override;
   void UpdateVisibilityState() override;
-  ash::ShelfVisibilityState GetVisibilityState() const override;
-  void UpdateIconPositionForWindow(ash::wm::WmWindow* window) override;
-  gfx::Rect GetScreenBoundsOfItemIconForWindow(
-      ash::wm::WmWindow* window) override;
-  void AddObserver(ash::wm::WmShelfObserver* observer) override;
-  void RemoveObserver(ash::wm::WmShelfObserver* observer) override;
+  ShelfVisibilityState GetVisibilityState() const override;
+  void UpdateIconPositionForWindow(wm::WmWindow* window) override;
+  gfx::Rect GetScreenBoundsOfItemIconForWindow(wm::WmWindow* window) override;
+  void AddObserver(wm::WmShelfObserver* observer) override;
+  void RemoveObserver(wm::WmShelfObserver* observer) override;
 
  private:
-  base::ObserverList<ash::wm::WmShelfObserver> observers_;
+  base::ObserverList<wm::WmShelfObserver> observers_;
 
   ShelfLayoutManager* shelf_layout_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(WmShelfMus);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_BRIDGE_WM_SHELF_MUS_H_
+#endif  // ASH_MUS_BRIDGE_WM_SHELF_MUS_H_