chromeos: changes how DisplayManagerObservers are notified

services/ui/ws/display.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 "services/ui/ws/display.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 172 matching lines @@
     }
   }
 }
 
 void Display::RemoveWindowManagerDisplayRoot(
     WindowManagerDisplayRoot* display_root) {
   for (auto it = window_manager_display_root_map_.begin();
        it != window_manager_display_root_map_.end(); ++it) {
     if (it->second == display_root) {
       window_manager_display_root_map_.erase(it);
+      if (window_manager_display_root_map_.empty())
+        display_manager()->DestroyDisplay(this);
       return;
     }
   }
   NOTREACHED();
 }
 
 void Display::SetNativeCursor(const ui::CursorData& cursor) {
   platform_display_->SetCursor(cursor);
 }
 
@@ skipping 89 matching lines @@
   return OzonePlatform::GetInstance();
 #else
   return nullptr;
 #endif
 }
 
 void Display::OnViewportMetricsChanged(
     const display::ViewportMetrics& metrics) {
   platform_display_->UpdateViewportMetrics(metrics);
 
-  if (root_->bounds().size() == metrics.bounds_in_pixels.size())
+  SetBoundsInPixels(metrics.bounds_in_pixels);
+}
+
+void Display::SetBoundsInPixels(const gfx::Rect& bounds_in_pixels) {
+  if (root_->bounds().size() == bounds_in_pixels.size())
     return;
 
-  gfx::Rect new_bounds(metrics.bounds_in_pixels.size());
+  gfx::Rect new_bounds(bounds_in_pixels.size());
   root_->SetBounds(new_bounds, allocator_.GenerateId());
   for (auto& pair : window_manager_display_root_map_)
     pair.second->root()->SetBounds(new_bounds, allocator_.GenerateId());
 }
 
 ServerWindow* Display::GetActiveRootWindow() {
   WindowManagerDisplayRoot* display_root = GetActiveWindowManagerDisplayRoot();
   if (display_root)
     return display_root->root();
   return nullptr;
@@ skipping 91 matching lines @@
 
   UserActivityMonitor* activity_monitor =
       window_server_->GetUserActivityMonitorForUser(
           window_server_->user_id_tracker()->active_id());
   activity_monitor->OnUserActivity();
   return EventDispatchDetails();
 }
 
 }  // namespace ws
 }  // namespace ui