Moves mash/wm into ash/mus

ash/mus/frame/caption_buttons/frame_caption_button_container_view.h

Index: ash/mus/frame/caption_buttons/frame_caption_button_container_view.h
diff --git a/mash/wm/frame/caption_buttons/frame_caption_button_container_view.h b/ash/mus/frame/caption_buttons/frame_caption_button_container_view.h
similarity index 93%
rename from mash/wm/frame/caption_buttons/frame_caption_button_container_view.h
rename to ash/mus/frame/caption_buttons/frame_caption_button_container_view.h
index 45f489e40ad45b64d72a044f9e73c660d2d71783..8f52f53b1d434849f9001b988e80fd9182cb0163 100644
--- a/mash/wm/frame/caption_buttons/frame_caption_button_container_view.h
+++ b/ash/mus/frame/caption_buttons/frame_caption_button_container_view.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
-#define MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
+#ifndef ASH_MUS_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
+#define ASH_MUS_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
 
 #include <map>
 #include <memory>
 
+#include "ash/mus/frame/caption_buttons/caption_button_types.h"
 #include "base/macros.h"
-#include "mash/wm/frame/caption_buttons/caption_button_types.h"
 #include "ui/gfx/animation/animation_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
@@ -22,8 +22,8 @@ namespace views {
 class Widget;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 class FrameCaptionButton;
 
@@ -130,7 +130,7 @@ class FrameCaptionButtonContainerView : public views::View,
   DISALLOW_COPY_AND_ASSIGN(FrameCaptionButtonContainerView);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_
+#endif  // ASH_MUS_FRAME_CAPTION_BUTTONS_FRAME_CAPTION_BUTTON_CONTAINER_VIEW_H_