Moves mash/wm into ash/mus

ash/mus/bridge/wm_root_window_controller_mus.cc

Index: ash/mus/bridge/wm_root_window_controller_mus.cc
diff --git a/mash/wm/bridge/wm_root_window_controller_mus.cc b/ash/mus/bridge/wm_root_window_controller_mus.cc
similarity index 73%
rename from mash/wm/bridge/wm_root_window_controller_mus.cc
rename to ash/mus/bridge/wm_root_window_controller_mus.cc
index 06ff9abc02766f3495785271ec82f137c1c99689..181af12918141cf2abc7c52ec7a263ef0983563d 100644
--- a/mash/wm/bridge/wm_root_window_controller_mus.cc
+++ b/ash/mus/bridge/wm_root_window_controller_mus.cc
@@ -2,30 +2,34 @@
 // 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_root_window_controller_mus.h"
+#include "ash/mus/bridge/wm_root_window_controller_mus.h"
 
 #include "ash/common/wm/wm_root_window_controller_observer.h"
+#include "ash/mus/bridge/wm_globals_mus.h"
+#include "ash/mus/bridge/wm_shelf_mus.h"
+#include "ash/mus/bridge/wm_window_mus.h"
+#include "ash/mus/container_ids.h"
+#include "ash/mus/root_window_controller.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_client.h"
-#include "mash/wm/bridge/wm_globals_mus.h"
-#include "mash/wm/bridge/wm_shelf_mus.h"
-#include "mash/wm/bridge/wm_window_mus.h"
-#include "mash/wm/container_ids.h"
-#include "mash/wm/root_window_controller.h"
 #include "ui/display/display.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/widget/widget.h"
 
-MUS_DECLARE_WINDOW_PROPERTY_TYPE(mash::wm::WmRootWindowControllerMus*);
+MUS_DECLARE_WINDOW_PROPERTY_TYPE(ash::mus::WmRootWindowControllerMus*);
 
-namespace mash {
-namespace wm {
+namespace {
 
-MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(mash::wm::WmRootWindowControllerMus*,
+MUS_DEFINE_LOCAL_WINDOW_PROPERTY_KEY(ash::mus::WmRootWindowControllerMus*,
                                      kWmRootWindowControllerKey,
                                      nullptr);
 
+}  // namespace
+
+namespace ash {
+namespace mus {
+
 WmRootWindowControllerMus::WmRootWindowControllerMus(
     WmGlobalsMus* globals,
     RootWindowController* root_window_controller)
@@ -41,7 +45,7 @@ WmRootWindowControllerMus::~WmRootWindowControllerMus() {
 
 // static
 const WmRootWindowControllerMus* WmRootWindowControllerMus::Get(
-    const mus::Window* window) {
+    const ::mus::Window* window) {
   if (!window)
     return nullptr;
 
@@ -50,7 +54,7 @@ const WmRootWindowControllerMus* WmRootWindowControllerMus::Get(
 
 void WmRootWindowControllerMus::NotifyFullscreenStateChange(
     bool is_fullscreen) {
-  FOR_EACH_OBSERVER(ash::wm::WmRootWindowControllerObserver, observers_,
+  FOR_EACH_OBSERVER(wm::WmRootWindowControllerObserver, observers_,
                     OnFullscreenStateChanged(is_fullscreen));
 }
 
@@ -79,26 +83,24 @@ bool WmRootWindowControllerMus::HasShelf() {
   return GetShelf() != nullptr;
 }
 
-ash::wm::WmGlobals* WmRootWindowControllerMus::GetGlobals() {
+wm::WmGlobals* WmRootWindowControllerMus::GetGlobals() {
   return globals_;
 }
 
-ash::wm::WorkspaceWindowState
-WmRootWindowControllerMus::GetWorkspaceWindowState() {
+wm::WorkspaceWindowState WmRootWindowControllerMus::GetWorkspaceWindowState() {
   NOTIMPLEMENTED();
-  return ash::wm::WORKSPACE_WINDOW_STATE_DEFAULT;
+  return wm::WORKSPACE_WINDOW_STATE_DEFAULT;
 }
 
-ash::AlwaysOnTopController*
-WmRootWindowControllerMus::GetAlwaysOnTopController() {
+AlwaysOnTopController* WmRootWindowControllerMus::GetAlwaysOnTopController() {
   return root_window_controller_->always_on_top_controller();
 }
 
-ash::wm::WmShelf* WmRootWindowControllerMus::GetShelf() {
+wm::WmShelf* WmRootWindowControllerMus::GetShelf() {
   return root_window_controller_->wm_shelf();
 }
 
-ash::wm::WmWindow* WmRootWindowControllerMus::GetWindow() {
+wm::WmWindow* WmRootWindowControllerMus::GetWindow() {
   return WmWindowMus::Get(root_window_controller_->root());
 }
 
@@ -110,30 +112,30 @@ void WmRootWindowControllerMus::ConfigureWidgetInitParamsForContainer(
       WmWindowMus::Get(root_window_controller_->root())
           ->GetChildByShellWindowId(shell_container_id));
   DCHECK(init_params->parent_mus);
-  mus::Window* new_window =
+  ::mus::Window* new_window =
       root_window_controller_->root()->window_tree()->NewWindow();
   WmWindowMus::Get(new_window)
       ->set_widget(widget, WmWindowMus::WidgetCreationType::INTERNAL);
   init_params->native_widget = new views::NativeWidgetMus(
       widget, root_window_controller_->GetConnector(), new_window,
-      mus::mojom::SurfaceType::DEFAULT);
+      ::mus::mojom::SurfaceType::DEFAULT);
 }
 
-ash::wm::WmWindow* WmRootWindowControllerMus::FindEventTarget(
+wm::WmWindow* WmRootWindowControllerMus::FindEventTarget(
     const gfx::Point& location_in_screen) {
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 void WmRootWindowControllerMus::AddObserver(
-    ash::wm::WmRootWindowControllerObserver* observer) {
+    wm::WmRootWindowControllerObserver* observer) {
   observers_.AddObserver(observer);
 }
 
 void WmRootWindowControllerMus::RemoveObserver(
-    ash::wm::WmRootWindowControllerObserver* observer) {
+    wm::WmRootWindowControllerObserver* observer) {
   observers_.RemoveObserver(observer);
 }
 
-}  // namespace wm
-}  // namespace mash
+}  // namespace mus
+}  // namespace ash