chromeos: Changes DisplayManagerObserver to have a single function

services/ui/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 "services/ui/ws/display_manager.h"
 
 #include <vector>
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 66 matching lines @@
   pending_displays_.insert(display);
 }
 
 void DisplayManager::AddDisplayForWindowManager(
     const display::Display& display,
     const display::ViewportMetrics& metrics) {
   OnDisplayAdded(display, metrics);
 }
 
 void DisplayManager::DestroyDisplay(Display* display) {
-  if (pending_displays_.count(display)) {
+  const bool is_pending = pending_displays_.count(display) > 0;
+  if (is_pending) {
     pending_displays_.erase(display);
   } else {
-    for (const auto& pair : user_display_managers_)
-      pair.second->OnWillDestroyDisplay(display->GetId());
-
     DCHECK(displays_.count(display));
     displays_.erase(display);
     window_server_->OnDisplayDestroyed(display);
   }
+  const int64_t display_id = display->GetId();
   delete display;
 
   // If we have no more roots left, let the app know so it can terminate.
   // TODO(sky): move to delegate/observer.
-  if (displays_.empty() && pending_displays_.empty())
+  if (displays_.empty() && pending_displays_.empty()) {
     window_server_->OnNoMoreDisplays();
+  } else {
+    for (const auto& pair : user_display_managers_)
+      pair.second->OnDisplayDestroyed(display_id);
+  }
 }
 
 void DisplayManager::DestroyAllDisplays() {
   while (!pending_displays_.empty())
     DestroyDisplay(*pending_displays_.begin());
   DCHECK(pending_displays_.empty());
 
   while (!displays_.empty())
     DestroyDisplay(*displays_.begin());
   DCHECK(displays_.empty());
 }
 
 std::set<const Display*> DisplayManager::displays() const {
   std::set<const Display*> ret_value(displays_.begin(), displays_.end());
   return ret_value;
 }
 
-void DisplayManager::OnDisplayUpdate(const display::Display& display) {
+void DisplayManager::OnDisplayUpdated(const display::Display& display) {
   for (const auto& pair : user_display_managers_)
-    pair.second->OnDisplayUpdate(display);
+    pair.second->OnDisplayUpdated(display);
 }
 
 Display* DisplayManager::GetDisplayContaining(const ServerWindow* window) {
   return const_cast<Display*>(
       static_cast<const DisplayManager*>(this)->GetDisplayContaining(window));
 }
 
 const Display* DisplayManager::GetDisplayContaining(
     const ServerWindow* window) const {
   while (window && window->parent())
@@ skipping 108 matching lines @@
       window_server_->window_manager_window_tree_factory_set()->GetFactories();
   for (WindowManagerWindowTreeFactory* factory : factories) {
     if (factory->window_tree())
       factory->window_tree()->OnWmDisplayModified(display);
   }
 
   // Update the PlatformWindow and ServerWindow size. This must happen after
   // OnWmDisplayModified() so the WM has updated the display size.
   ws_display->OnViewportMetricsChanged(metrics);
 
-  OnDisplayUpdate(display);
+  OnDisplayUpdated(display);
 }
 
 void DisplayManager::OnPrimaryDisplayChanged(int64_t primary_display_id) {
   DVLOG(3) << "OnPrimaryDisplayChanged: " << primary_display_id;
   // TODO(kylechar): Send IPCs to WM clients first.
 
   // Send IPCs to any DisplayManagerObservers.
   for (const auto& pair : user_display_managers_)
     pair.second->OnPrimaryDisplayChanged(primary_display_id);
 }
 
 }  // namespace ws
 }  // namespace ui