Remove usage of ws::Display in ws::UserDisplayManager.

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 27 matching lines @@
 
 DisplayManager::~DisplayManager() {
   user_id_tracker_->RemoveObserver(this);
   DestroyAllDisplays();
 }
 
 UserDisplayManager* DisplayManager::GetUserDisplayManager(
     const UserId& user_id) {
   if (!user_display_managers_.count(user_id)) {
     user_display_managers_[user_id] =
-        base::MakeUnique<UserDisplayManager>(this, window_server_, user_id);
+        base::MakeUnique<UserDisplayManager>(window_server_, user_id);
   }
   return user_display_managers_[user_id].get();
 }
 
 CursorLocationManager* DisplayManager::GetCursorLocationManager(
     const UserId& user_id) {
   if (!cursor_location_managers_.count(user_id)) {
     cursor_location_managers_[user_id] =
         base::MakeUnique<CursorLocationManager>();
   }
   return cursor_location_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) {
   if (pending_displays_.count(display)) {
     pending_displays_.erase(display);
   } else {
     for (const auto& pair : user_display_managers_)
-      pair.second->OnWillDestroyDisplay(display);
+      pair.second->OnWillDestroyDisplay(display->GetId());
 
     DCHECK(displays_.count(display));
     displays_.erase(display);
     window_server_->OnDisplayDestroyed(display);
   }
   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())
@@ skipping 10 matching lines @@
   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(Display* display) {
   for (const auto& pair : user_display_managers_)
-    pair.second->OnDisplayUpdate(display);
+    pair.second->OnDisplayUpdate(display->ToDisplay());
 }
 
 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 113 matching lines @@
 void DisplayManager::OnPrimaryDisplayChanged(int64_t 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