Start using display.mojom.Display in mus+ash.

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"
@@ skipping 46 matching lines @@
   // 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);
 
-  mojo::Array<mojom::DisplayPtr> GetAllDisplays();
+  mojo::Array<mojom::WmDisplayPtr> 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*>(
         cursor_location_mapping_.get());
@@ skipping 31 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_