Shuffles and renames ash/common/wm classes

ash/mus/window_manager_application.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 ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 #define ASH_MUS_WINDOW_MANAGER_APPLICATION_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 27 matching lines @@
 }
 
 namespace ash {
 namespace mus {
 
 class AcceleratorRegistrarImpl;
 class RootWindowController;
 class RootWindowsObserver;
 class ShelfLayoutImpl;
 class UserWindowControllerImpl;
-class WmGlobalsMus;
+class WmShellMus;
 class WmLookupMus;
 class WmScreen;
 
 class WindowManagerApplication
     : public shell::ShellClient,
       public ::mus::mojom::WindowManagerFactory,
       public shell::InterfaceFactory<mojom::ShelfLayout>,
       public shell::InterfaceFactory<mojom::UserWindowController>,
       public shell::InterfaceFactory<::mus::mojom::AcceleratorRegistrar> {
  public:
   WindowManagerApplication();
   ~WindowManagerApplication() override;
 
   shell::Connector* connector() { return connector_; }
 
   // Returns the RootWindowControllers that have valid roots.
   //
   // NOTE: this does not return |controllers_| as most clients want a
   // RootWindowController that has a valid root window.
   std::set<RootWindowController*> GetRootControllers();
 
-  WmGlobalsMus* globals() { return globals_.get(); }
+  WmShellMus* shell() { return shell_.get(); }
 
   // Called when the root window of |root_controller| is obtained.
   void OnRootWindowControllerGotRoot(RootWindowController* root_controller);
 
   // Called after RootWindowController creates the necessary resources.
   void OnRootWindowControllerDoneInit(RootWindowController* root_controller);
 
   // Called when the root mus::Window of RootWindowController is destroyed.
   // |root_controller| is destroyed after this call.
   void OnRootWindowDestroyed(RootWindowController* root_controller);
@@ skipping 41 matching lines @@
       mojo::InterfaceRequest<::mus::mojom::WindowTreeClient> client_request)
       override;
 
   shell::Connector* connector_;
 
   mojo::TracingImpl tracing_;
 
   std::unique_ptr<display::Screen> screen_;
   std::unique_ptr<views::AuraInit> aura_init_;
 
-  std::unique_ptr<WmGlobalsMus> globals_;
+  std::unique_ptr<WmShellMus> shell_;
   std::unique_ptr<WmLookupMus> lookup_;
 
   // The |shelf_layout_| object is created once OnEmbed() is called. Until that
   // time |shelf_layout_requests_| stores pending interface requests.
   std::unique_ptr<ShelfLayoutImpl> shelf_layout_;
   mojo::BindingSet<mojom::ShelfLayout> shelf_layout_bindings_;
   std::vector<std::unique_ptr<mojo::InterfaceRequest<mojom::ShelfLayout>>>
       shelf_layout_requests_;
 
   // |user_window_controller_| is created once OnEmbed() is called. Until that
@@ skipping 15 matching lines @@
 
   base::ObserverList<RootWindowsObserver> root_windows_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_