Moves EventDispatcher from Display to WindowManagerState

components/mus/ws/display_manager.cc

 // 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.
 
 #include "components/mus/ws/display_manager.h"
 
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_manager_delegate.h"
 #include "components/mus/ws/server_window.h"
 #include "components/mus/ws/user_display_manager.h"
@@ skipping 21 matching lines @@
   }
   return user_display_managers_[user_id].get();
 }
 
 void DisplayManager::AddDisplay(Display* display) {
   DCHECK_EQ(0u, pending_displays_.count(display));
   pending_displays_.insert(display);
 }
 
 void DisplayManager::DestroyDisplay(Display* display) {
-  delegate_->OnWillDestroyDisplay(display);
-
   if (pending_displays_.count(display)) {
     pending_displays_.erase(display);
   } else {
     for (const auto& pair : user_display_managers_)
       pair.second->OnWillDestroyDisplay(display);
 
     DCHECK(displays_.count(display));
     displays_.erase(display);
   }
   delete display;
@@ skipping 28 matching lines @@
     const ServerWindow* window) const {
   while (window && window->parent())
     window = window->parent();
   for (Display* display : displays_) {
     if (window == display->root_window())
       return display;
   }
   return nullptr;
 }
 
-Display* DisplayManager::GetActiveDisplay() {
-  // TODO(sky): this isn't active, but first. Make it active.
-  return displays_.size() ? *displays_.begin() : nullptr;
-}
-
 WindowManagerAndDisplayConst DisplayManager::GetWindowManagerAndDisplay(
     const ServerWindow* window) const {
   const ServerWindow* last = window;
   while (window && window->parent()) {
     last = window;
     window = window->parent();
   }
   for (Display* display : displays_) {
     if (window == display->root_window()) {
       WindowManagerAndDisplayConst result;
@@ skipping 37 matching lines @@
   DCHECK_EQ(0u, displays_.count(display));
   const bool is_first_display = displays_.empty();
   displays_.insert(display);
   pending_displays_.erase(display);
   if (is_first_display)
     delegate_->OnFirstDisplayReady();
 }
 
 }  // namespace ws
 }  // namespace mus