Start to decouple display::Display from ws::PlatformDisplay.

services/ui/ws/display_manager.h

 // 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.
 
 #ifndef SERVICES_UI_WS_DISPLAY_MANAGER_H_
 #define SERVICES_UI_WS_DISPLAY_MANAGER_H_
 
 #include <map>
 #include <memory>
 #include <set>
 
 #include "base/macros.h"
 #include "services/ui/display/screen_manager_delegate.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/user_id.h"
 #include "services/ui/ws/user_id_tracker_observer.h"
+#include "ui/display/display.h"
 
 namespace ui {
 namespace ws {
 
 class CursorLocationManager;
 class Display;
 class ServerWindow;
 class UserDisplayManager;
 class UserIdTracker;
 class WindowManagerDisplayRoot;
@@ skipping 17 matching lines @@
 
   // Adds/removes a Display. DisplayManager owns the Displays.
   // TODO(sky): make add take a scoped_ptr.
   void AddDisplay(Display* display);
   void DestroyDisplay(Display* display);
   void DestroyAllDisplays();
   const std::set<Display*>& displays() { return displays_; }
   std::set<const Display*> displays() const;
 
   // Notifies when something about the Display changes.
-  void OnDisplayUpdate(Display* display);
+  void OnDisplayUpdate(const display::Display& display);
 
   // Returns the Display that contains |window|, or null if |window| is not
   // attached to a display.
   Display* GetDisplayContaining(const ServerWindow* window);
   const Display* GetDisplayContaining(const ServerWindow* window) const;
 
   // Returns the display with the specified display id, or null if there is no
   // display with that id.
   Display* GetDisplayById(int64_t display_id);
 
@@ skipping 14 matching lines @@
 
   // Called when the AcceleratedWidget is available for |display|.
   void OnDisplayAcceleratedWidgetAvailable(Display* display);
 
  private:
   // UserIdTrackerObserver:
   void OnActiveUserIdChanged(const UserId& previously_active_id,
                              const UserId& active_id) override;
 
   // display::ScreenManagerDelegate:
-  void OnDisplayAdded(int64_t id,
+  void OnDisplayAdded(const display::Display& display,
                       const display::ViewportMetrics& metrics) override;
   void OnDisplayRemoved(int64_t id) override;
-  void OnDisplayModified(int64_t id,
+  void OnDisplayModified(const display::Display& display,
                          const display::ViewportMetrics& metrics) override;
   void OnPrimaryDisplayChanged(int64_t primary_display_id) override;
 
   WindowServer* window_server_;
   UserIdTracker* user_id_tracker_;
 
   // Displays are initially added to |pending_displays_|. When the display is
   // initialized it is moved to |displays_|. WindowServer owns the Displays.
   std::set<Display*> pending_displays_;
   std::set<Display*> displays_;
 
   std::map<UserId, std::unique_ptr<UserDisplayManager>> user_display_managers_;
 
   std::map<UserId, std::unique_ptr<CursorLocationManager>>
       cursor_location_managers_;
 
   // ID to use for next root node.
   ClientSpecificId next_root_id_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayManager);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_MANAGER_H_