Shuffles and renames ash/common/wm classes

ash/mus/root_window_controller.cc

 // Copyright 2016 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.
 
 #include "ash/mus/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <sstream>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm/always_on_top_controller.h"
 #include "ash/common/wm/dock/docked_window_layout_manager.h"
 #include "ash/common/wm/panels/panel_layout_manager.h"
 #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"
 #include "ash/mus/screenlock_layout.h"
 #include "ash/mus/shadow_controller.h"
 #include "ash/mus/shelf_layout_manager.h"
 #include "ash/mus/status_layout_manager.h"
 #include "ash/mus/window_manager.h"
 #include "ash/mus/window_manager_application.h"
 #include "base/bind.h"
@@ skipping 133 matching lines @@
 
 void RootWindowController::OnEmbed(::mus::Window* root) {
   root_ = root;
   root_->set_local_id(ContainerToLocalId(Container::ROOT));
   root_->AddObserver(this);
   layout_managers_[root_].reset(new FillLayout(root_));
 
   app_->OnRootWindowControllerGotRoot(this);
 
   wm_root_window_controller_.reset(
-      new WmRootWindowControllerMus(app_->globals(), this));
+      new WmRootWindowControllerMus(app_->shell(), this));
 
   CreateContainers();
 
   for (size_t i = 0; i < kNumActivationContainers; ++i) {
     window_manager_client()->AddActivationParent(
         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(
       new AlwaysOnTopController(always_on_top_container));
 
   AddAccelerators();
 
   window_manager_->Initialize(this, app_->session());
 
   shadow_controller_.reset(new ShadowController(root->window_tree()));
@@ skipping 148 matching lines @@
   ::mus::Window* user_private_always_on_top =
       GetWindowForContainer(Container::USER_PRIVATE_ALWAYS_ON_TOP_WINDOWS);
   WmWindowMus* user_private_always_on_top_wm =
       WmWindowMus::Get(user_private_always_on_top);
   user_private_always_on_top_wm->SetChildrenUseExtendedHitRegion();
   user_private_always_on_top_wm->SetSnapsChildrenToPhysicalPixelBoundary();
 }
 
 }  // namespace mus
 }  // namespace ash