mus: Changes SetDisplayRoot() to create actual display

Desktop / Chromium - sky [chromium.org] - 20 April 2017 13:47 EDT

It now takes enough information for mus to create the display. Further we now assume mus has not created the display at the time SetDisplayRoot() is called.

BUG=708279 TEST=covered by tests R=kylechar@chromium.org, nasko@chromium.org

Review-Url: https://codereview.chromium.org/2829733002 Cr-Commit-Position: refs/heads/master@{#466057}

c53add4 mus: Changes SetDisplayRoot() to create actual display
services/ui/display/screen_manager.h | 4 +
services/ui/display/screen_manager_forwarding.cc | 11 ++-
services/ui/display/screen_manager_forwarding.h | 2 +
.../ui/display/screen_manager_ozone_external.cc | 8 +-
.../ui/display/screen_manager_ozone_external.h | 3 +
.../ui/display/screen_manager_ozone_internal.cc | 4 +
.../ui/display/screen_manager_ozone_internal.h | 1 +
.../ui/display/screen_manager_stub_internal.cc | 8 +-
services/ui/display/screen_manager_stub_internal.h | 5 ++
services/ui/public/interfaces/window_manager.mojom | 10 ++-
.../interfaces/window_manager_constants.mojom | 7 ++
services/ui/service.cc | 33 +++++++-
services/ui/service.h | 20 +++++
services/ui/ws/display_manager.cc | 6 ++
services/ui/ws/display_manager.h | 3 +
services/ui/ws/test_utils.cc | 4 +
services/ui/ws/test_utils.h | 8 +-
.../ui/ws/window_manager_window_tree_factory.cc | 5 ++
services/ui/ws/window_server_delegate.cc | 3 +
services/ui/ws/window_server_delegate.h | 6 ++
services/ui/ws/window_tree.cc | 91 ++++++++++++++++------
services/ui/ws/window_tree.h | 14 +++-
services/ui/ws/window_tree_unittest.cc | 31 ++++----
23 files changed, 231 insertions(+), 56 deletions(-)

Upstream: git.chromium.org


  • Share