Moves mash/wm into ash/mus

ash/mus/non_client_frame_controller.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
-#define MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
+#ifndef ASH_MUS_NON_CLIENT_FRAME_CONTROLLER_H_
+#define ASH_MUS_NON_CLIENT_FRAME_CONTROLLER_H_
 
 #include <stdint.h>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace gfx {
 class Insets;
 }
 
 namespace mus {
 class Window;
 class WindowManagerClient;
 }
 
 namespace shell {
 class Connector;
 }
 
-namespace mash {
-namespace wm {
+namespace ash {
+namespace mus {
 
 // Provides the non-client frame for mus Windows.
 class NonClientFrameController : public views::WidgetDelegateView,
-                                 public mus::WindowObserver {
+                                 public ::mus::WindowObserver {
  public:
   // NonClientFrameController deletes itself when |window| is destroyed.
   static void Create(shell::Connector* connector,
-                     mus::Window* parent,
-                     mus::Window* window,
-                     mus::WindowManagerClient* window_manager_client);
+                     ::mus::Window* parent,
+                     ::mus::Window* window,
+                     ::mus::WindowManagerClient* window_manager_client);
 
   // Returns the preferred client area insets.
   static gfx::Insets GetPreferredClientAreaInsets();
 
   // Returns the width needed to display the standard set of buttons on the
   // title bar.
   static int GetMaxTitleBarButtonWidth();
 
-  mus::Window* window() { return window_; }
+  ::mus::Window* window() { return window_; }
 
  private:
   NonClientFrameController(shell::Connector* connector,
-                           mus::Window* parent,
-                           mus::Window* window,
-                           mus::WindowManagerClient* window_manager_client);
+                           ::mus::Window* parent,
+                           ::mus::Window* window,
+                           ::mus::WindowManagerClient* window_manager_client);
   ~NonClientFrameController() override;
 
   // views::WidgetDelegateView:
   base::string16 GetWindowTitle() const override;
   views::View* GetContentsView() override;
   bool CanResize() const override;
   bool CanMaximize() const override;
   bool CanMinimize() const override;
   bool ShouldShowWindowTitle() const override;
   views::ClientView* CreateClientView(views::Widget* widget) override;
 
   // mus::WindowObserver:
   void OnWindowSharedPropertyChanged(
-      mus::Window* window,
+      ::mus::Window* window,
       const std::string& name,
       const std::vector<uint8_t>* old_data,
       const std::vector<uint8_t>* new_data) override;
-  void OnWindowLocalPropertyChanged(mus::Window* window,
+  void OnWindowLocalPropertyChanged(::mus::Window* window,
                                     const void* key,
                                     intptr_t old) override;
-  void OnWindowDestroyed(mus::Window* window) override;
+  void OnWindowDestroyed(::mus::Window* window) override;
 
   views::Widget* widget_;
 
   // WARNING: as widget delays destruction there is a portion of time when this
   // is null.
-  mus::Window* window_;
+  ::mus::Window* window_;
 
   DISALLOW_COPY_AND_ASSIGN(NonClientFrameController);
 };
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash
 
-#endif  // MASH_WM_NON_CLIENT_FRAME_CONTROLLER_H_
+#endif  // ASH_MUS_NON_CLIENT_FRAME_CONTROLLER_H_