Fixes shutdown race in mash

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>
 #include <set>
 
-#include "ash/mus/root_windows_observer.h"
+#include "ash/mus/window_manager_observer.h"
 #include "ash/public/interfaces/shelf_layout.mojom.h"
 #include "ash/public/interfaces/user_window_controller.mojom.h"
 #include "base/macros.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/interfaces/accelerator_registrar.mojom.h"
 #include "mash/session/public/interfaces/session.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
@@ skipping 18 matching lines @@
 class ShelfLayoutImpl;
 class UserWindowControllerImpl;
 class WindowManager;
 
 class WindowManagerApplication
     : public shell::ShellClient,
       public shell::InterfaceFactory<mojom::ShelfLayout>,
       public shell::InterfaceFactory<mojom::UserWindowController>,
       public shell::InterfaceFactory<::mus::mojom::AcceleratorRegistrar>,
       public mash::session::mojom::ScreenlockStateListener,
-      public RootWindowsObserver {
+      public WindowManagerObserver {
  public:
   WindowManagerApplication();
   ~WindowManagerApplication() override;
 
   shell::Connector* connector() { return connector_; }
 
   WindowManager* window_manager() { return window_manager_.get(); }
 
-  // TODO(sky): figure out right place for this code.
-  void OnAccelerator(uint32_t id, const ui::Event& event);
-
   mash::session::mojom::Session* session() { return session_.get(); }
 
  private:
   friend class WmTestBase;
   friend class WmTestHelper;
 
   void OnAcceleratorRegistrarDestroyed(AcceleratorRegistrarImpl* registrar);
 
   void InitWindowManager(::mus::WindowTreeClient* window_tree_client);
 
@@ skipping 13 matching lines @@
       mojo::InterfaceRequest<mojom::UserWindowController> request) override;
 
   // shell::InterfaceFactory<mus::mojom::AcceleratorRegistrar>:
   void Create(shell::Connection* connection,
               mojo::InterfaceRequest<::mus::mojom::AcceleratorRegistrar>
                   request) override;
 
   // session::mojom::ScreenlockStateListener:
   void ScreenlockStateChanged(bool locked) override;
 
-  // RootWindowsObserver:
+  // WindowManagerObserver:
   void OnRootWindowControllerAdded(RootWindowController* controller) override;
   void OnWillDestroyRootWindowController(
       RootWindowController* controller) override;
 
   shell::Connector* connector_;
 
   mojo::TracingImpl tracing_;
 
   std::unique_ptr<views::AuraInit> aura_init_;
 
@@ skipping 22 matching lines @@
   mojo::Binding<mash::session::mojom::ScreenlockStateListener>
       screenlock_state_listener_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerApplication);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_WINDOW_MANAGER_APPLICATION_H_