Fixes shutdown race in mash

ash/mus/window_manager.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.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/mus/bridge/wm_lookup_mus.h"
 #include "ash/mus/bridge/wm_shell_mus.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/non_client_frame_controller.h"
 #include "ash/mus/property_util.h"
 #include "ash/mus/root_window_controller.h"
-#include "ash/mus/root_windows_observer.h"
 #include "ash/mus/shadow_controller.h"
-#include "ash/mus/window_manager_application.h"
+#include "ash/mus/window_manager_observer.h"
 #include "ash/public/interfaces/container.mojom.h"
 #include "components/mus/common/event_matcher_util.h"
 #include "components/mus/common/types.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_property.h"
 #include "components/mus/public/cpp/window_tree_client.h"
 #include "components/mus/public/interfaces/mus_constants.mojom.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "ui/events/mojo/event.mojom.h"
 #include "ui/views/mus/screen_mus.h"
 
 namespace ash {
 namespace mus {
 
 const uint32_t kWindowSwitchAccelerator = 1;
 
 void AssertTrue(bool success) {
   DCHECK(success);
 }
 
-WindowManager::WindowManager(WindowManagerApplication* window_manager_app,
-                             shell::Connector* connector)
-    : window_manager_app_(window_manager_app), connector_(connector) {}
+WindowManager::WindowManager(shell::Connector* connector)
+    : connector_(connector) {}
 
 WindowManager::~WindowManager() {
   // NOTE: |window_tree_client_| may already be null.
   delete window_tree_client_;
 }
 
 void WindowManager::Init(::mus::WindowTreeClient* window_tree_client) {
   DCHECK(!window_tree_client_);
   window_tree_client_ = window_tree_client;
 
@@ skipping 37 matching lines @@
   return root_window_controller->NewTopLevelWindow(properties);
 }
 
 std::set<RootWindowController*> WindowManager::GetRootWindowControllers() {
   std::set<RootWindowController*> result;
   for (auto& root_window_controller : root_window_controllers_)
     result.insert(root_window_controller.get());
   return result;
 }
 
-void WindowManager::AddRootWindowsObserver(RootWindowsObserver* observer) {
-  root_windows_observers_.AddObserver(observer);
+void WindowManager::AddObserver(WindowManagerObserver* observer) {
+  observers_.AddObserver(observer);
 }
 
-void WindowManager::RemoveRootWindowsObserver(RootWindowsObserver* observer) {
-  root_windows_observers_.RemoveObserver(observer);
+void WindowManager::RemoveObserver(WindowManagerObserver* observer) {
+  observers_.RemoveObserver(observer);
 }
 
 void WindowManager::AddAccelerators() {
   // TODO(sky): this is broke for multi-display case. Need to fix mus to
   // deal correctly.
   window_manager_client_->AddAccelerator(
       kWindowSwitchAccelerator,
       ::mus::CreateKeyMatcher(ui::mojom::KeyboardCode::TAB,
                               ui::mojom::kEventFlagControlDown),
       base::Bind(&AssertTrue));
 }
 
 RootWindowController* WindowManager::CreateRootWindowController(
     ::mus::Window* window,
     const display::Display& display) {
   // TODO(sky): there is timing issues with using ScreenMus.
   if (!screen_) {
     std::unique_ptr<views::ScreenMus> screen(new views::ScreenMus(nullptr));
     screen->Init(connector_);
     screen_ = std::move(screen);
   }
 
   std::unique_ptr<RootWindowController> root_window_controller_ptr(
       new RootWindowController(this, window, display));
   RootWindowController* root_window_controller =
       root_window_controller_ptr.get();
   root_window_controllers_.insert(std::move(root_window_controller_ptr));
   window->AddObserver(this);
 
-  FOR_EACH_OBSERVER(RootWindowsObserver, root_windows_observers_,
+  FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
                     OnRootWindowControllerAdded(root_window_controller));
   return root_window_controller;
 }
 
 void WindowManager::OnWindowDestroying(::mus::Window* window) {
   for (auto it = root_window_controllers_.begin();
        it != root_window_controllers_.end(); ++it) {
     if ((*it)->root() == window) {
-      FOR_EACH_OBSERVER(RootWindowsObserver, root_windows_observers_,
+      FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
                         OnWillDestroyRootWindowController((*it).get()));
       return;
     }
   }
   NOTREACHED();
 }
 
 void WindowManager::OnWindowDestroyed(::mus::Window* window) {
   window->RemoveObserver(this);
   for (auto it = root_window_controllers_.begin();
@@ skipping 14 matching lines @@
 void WindowManager::OnWindowTreeClientDestroyed(
     ::mus::WindowTreeClient* client) {
   // Destroying the roots should result in removal from
   // |root_window_controllers_|.
   DCHECK(root_window_controllers_.empty());
 
   lookup_.reset();
   shell_.reset();
   shadow_controller_.reset();
 
+  FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
+                    OnWindowTreeClientDestroyed());
+
   window_tree_client_ = nullptr;
-  // TODO(sky): this should likely shutdown.
+  window_manager_client_ = nullptr;
 }
 
 void WindowManager::OnEventObserved(const ui::Event& event,
                                     ::mus::Window* target) {
   // Does not use EventObservers.
 }
 
 void WindowManager::SetWindowManagerClient(::mus::WindowManagerClient* client) {
   window_manager_client_ = client;
 }
@@ skipping 35 matching lines @@
                                    const display::Display& display) {
   CreateRootWindowController(window, display);
 }
 
 void WindowManager::OnAccelerator(uint32_t id, const ui::Event& event) {
   switch (id) {
     case kWindowSwitchAccelerator:
       window_manager_client()->ActivateNextWindow();
       break;
     default:
-      window_manager_app_->OnAccelerator(id, event);
+      FOR_EACH_OBSERVER(WindowManagerObserver, observers_,
+                        OnAccelerator(id, event));
       break;
   }
 }
 
 }  // namespace mus
 }  // namespace ash