Primary display change notifications.

services/ui/ws/user_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_USER_DISPLAY_MANAGER_H_
 #define SERVICES_UI_WS_USER_DISPLAY_MANAGER_H_
 
 #include <set>
 
 #include "base/atomicops.h"
 #include "base/macros.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
-#include "services/ui/public/interfaces/display.mojom.h"
+#include "services/ui/public/interfaces/display_manager.mojom.h"
 #include "services/ui/ws/user_id.h"
 
 namespace gfx {
 class Point;
 }
 
 namespace ui {
 namespace ws {
 
 class Display;
@@ skipping 11 matching lines @@
                      UserDisplayManagerDelegate* delegate,
                      const UserId& user_id);
   ~UserDisplayManager() override;
 
   // Called when the frame decorations for this user change.
   void OnFrameDecorationValuesChanged();
 
   void AddDisplayManagerBinding(
       mojo::InterfaceRequest<mojom::DisplayManager> request);
 
+  // Called when something about the display (e.g. pixel-ratio, size) changes.
+  void OnDisplayUpdate(Display* display);
+
   // Called by Display prior to |display| being removed and destroyed.
   void OnWillDestroyDisplay(Display* display);
 
+  // Called when the primary display changes.
+  void OnPrimaryDisplayChanged(int64_t primary_display_id);
+
   // Called from WindowManagerState when its EventDispatcher receives a mouse
   // event.
   void OnMouseCursorLocationChanged(const gfx::Point& point);
 
-  // Called when something about the display (e.g. pixel-ratio, size) changes.
-  void OnDisplayUpdate(Display* display);
-
   // Returns a read-only handle to the shared memory which contains the global
   // mouse cursor position. Each call returns a new handle.
   mojo::ScopedSharedBufferHandle GetCursorLocationMemory();
 
  private:
   friend class test::UserDisplayManagerTestApi;
 
   // Called when a new observer is added. If frame decorations are available
   // notifies the observer immediately.
   void OnObserverAdded(mojom::DisplayManagerObserver* observer);
 
+  // Fills in a WsDisplayPtr for |display|.
+  mojom::WsDisplayPtr GetWsDisplayPtr(const Display& display);
+
   mojo::Array<mojom::WsDisplayPtr> GetAllDisplays();
 
   // Calls OnDisplays() on |observer|.
   void CallOnDisplays(mojom::DisplayManagerObserver* observer);
 
   // Overriden from mojom::DisplayManager:
   void AddObserver(mojom::DisplayManagerObserverPtr observer) override;
 
   base::subtle::Atomic32* cursor_location_memory() {
     return reinterpret_cast<base::subtle::Atomic32*>(
@@ skipping 32 matching lines @@
   // mojo connection, this data must be read atomically.)
   mojo::ScopedSharedBufferMapping cursor_location_mapping_;
 
   DISALLOW_COPY_AND_ASSIGN(UserDisplayManager);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_USER_DISPLAY_MANAGER_H_