Fixes shutdown race in mash

ash/mus/window_manager_observer.h

 // 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.
 
-#ifndef ASH_MUS_ROOT_WINDOW_OBSERVERS_H_
-#define ASH_MUS_ROOT_WINDOW_OBSERVERS_H_
+#ifndef ASH_MUS_WINDOW_OBSERVER_H_
+#define ASH_MUS_WINDOW_OBSERVER_H_
+
+#include <stdint.h>
+
+namespace ui {
+class Event;
+}
 
 namespace ash {
 namespace mus {
 
 class RootWindowController;
 
-class RootWindowsObserver {
+class WindowManagerObserver {
  public:
-  // Called once a new display has been created and the root Window obtained.
+  // Called when the WindowTreeClient associated with the WindowManager is
+  // about to be destroyed.
+  virtual void OnWindowTreeClientDestroyed() {}
+
+  virtual void OnAccelerator(uint32_t id, const ui::Event& event) {}
+
   virtual void OnRootWindowControllerAdded(RootWindowController* controller) {}
-
-  // Called before a RootWindowController is destroyed.
   virtual void OnWillDestroyRootWindowController(
       RootWindowController* controller) {}
 
  protected:
-  ~RootWindowsObserver() {}
+  virtual ~WindowManagerObserver() {}
 };
 
 }  // namespace mus
 }  // namespace ash
 
-#endif  // ASH_MUS_ROOT_WINDOW_OBSERVERS_H_
+#endif  // ASH_MUS_WINDOW_OBSERVER_H_