Shuffles and renames ash/common/wm classes

ash/mus/root_window_controller.cc

Index: ash/mus/root_window_controller.cc
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index c8426434ad49442e472a56dc602c5b91d01cfc95..28a777f122228cdae249fc59aef5e4ab32df7c8e 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -16,9 +16,9 @@
 #include "ash/common/wm/workspace/workspace_layout_manager.h"
 #include "ash/common/wm/workspace/workspace_layout_manager_delegate.h"
 #include "ash/mus/background_layout.h"
-#include "ash/mus/bridge/wm_globals_mus.h"
 #include "ash/mus/bridge/wm_root_window_controller_mus.h"
 #include "ash/mus/bridge/wm_shelf_mus.h"
+#include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/container_ids.h"
 #include "ash/mus/fill_layout.h"
@@ -172,7 +172,7 @@ void RootWindowController::OnEmbed(::mus::Window* root) {
   app_->OnRootWindowControllerGotRoot(this);
 
   wm_root_window_controller_.reset(
-      new WmRootWindowControllerMus(app_->globals(), this));
+      new WmRootWindowControllerMus(app_->shell(), this));
 
   CreateContainers();
 
@@ -181,7 +181,7 @@ void RootWindowController::OnEmbed(::mus::Window* root) {
         GetWindowForContainer(kActivationContainers[i]));
   }
 
-  wm::WmWindow* always_on_top_container =
+  WmWindow* always_on_top_container =
       WmWindowMus::Get(root)->GetChildByShellWindowId(
           kShellWindowId_AlwaysOnTopContainer);
   always_on_top_controller_.reset(