chromeos: Changes DisplayManagerObserver to have a single function

services/ui/ws/display_manager.cc

Index: services/ui/ws/display_manager.cc
diff --git a/services/ui/ws/display_manager.cc b/services/ui/ws/display_manager.cc
index 286993ece49f719e85e779983db9d3e10b488f2e..6575884cac1209f67717c14e972e2202cd1eae76 100644
--- a/services/ui/ws/display_manager.cc
+++ b/services/ui/ws/display_manager.cc
@@ -84,22 +84,25 @@ void DisplayManager::AddDisplayForWindowManager(
 }
 
 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() {
@@ -117,9 +120,9 @@ std::set<const Display*> DisplayManager::displays() const {
   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) {
@@ -248,7 +251,7 @@ void DisplayManager::OnDisplayModified(
   // 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) {