Shuffles and renames ash/common/wm classes

ash/mus/window_manager_application.cc

 // 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.
 
 #include "ash/mus/window_manager_application.h"
 
 #include <utility>
 
 #include "ash/mus/accelerator_registrar_impl.h"
-#include "ash/mus/bridge/wm_globals_mus.h"
 #include "ash/mus/bridge/wm_lookup_mus.h"
+#include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/root_window_controller.h"
 #include "ash/mus/root_windows_observer.h"
 #include "ash/mus/shelf_layout_impl.h"
 #include "ash/mus/user_window_controller_impl.h"
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "components/mus/common/event_matcher_util.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/interfaces/window_manager_factory.mojom.h"
 #include "services/shell/public/cpp/connection.h"
@@ skipping 27 matching lines @@
   std::set<RootWindowController*> root_controllers;
   for (RootWindowController* controller : root_controllers_) {
     if (controller->root())
       root_controllers.insert(controller);
   }
   return root_controllers;
 }
 
 void WindowManagerApplication::OnRootWindowControllerGotRoot(
     RootWindowController* root_controller) {
-  if (globals_)
+  if (shell_)
     return;  // |root_controller| is the > 1 root, nothing to do.
 
   if (connector_)
     aura_init_.reset(new views::AuraInit(connector_, "ash_mus_resources.pak"));
 
-  globals_.reset(new WmGlobalsMus(root_controller->root()->window_tree()));
+  shell_.reset(new WmShellMus(root_controller->root()->window_tree()));
   lookup_.reset(new WmLookupMus);
 }
 
 void WindowManagerApplication::OnRootWindowControllerDoneInit(
     RootWindowController* root_controller) {
   if (!screen_) {
     std::unique_ptr<views::ScreenMus> screen(new views::ScreenMus(nullptr));
     screen->Init(connector_);
     screen_ = std::move(screen);
   }
@@ skipping 122 matching lines @@
 
 void WindowManagerApplication::CreateWindowManager(
     ::mus::mojom::DisplayPtr display,
     mojo::InterfaceRequest<::mus::mojom::WindowTreeClient> client_request) {
   AddRootWindowController(RootWindowController::CreateFromDisplay(
       this, std::move(display), std::move(client_request)));
 }
 
 }  // namespace mus
 }  // namespace ash