Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Issue 2072343002: Changes how window manager obtains WindowTree from mus (Closed)

Created:
4 years, 6 months ago by sky
Modified:
4 years, 6 months ago
CC:
chromium-reviews, rjkroege, sadrul, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, yzshen+watch_chromium.org, abarth-chromium, Aaron Boodman, kalyank, darin (slow to review), ben+mojo_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Changes how window manager obtains WindowTree from mus Prior to this patch there was a WindowTree per display. This is problematic as it means the window manager can't move windows between displays. This patch makes it so there is a WindowTree per window manager with a root per display. The window manager establishes its connection by way of WindowManagerWindowTreeFactory::CreateWindowTree(). Mus then calls OnConnect() to give the client the client id, followed by WmNewDisplayAdded() once per display root. Changing this resulted in having to change around ash/mus. Previously there was a WindowManager per display, now there is a single WindowManager with the per display information held by RootWindowController. Ideally I would have left these changes to a separate patch, but changing around the mojoms means I have to do it all at once. On the mus side there is some state held per display that needs to be upleveled as well. To avoid making this patch even larger I'm leaving that for a future patch. This resulted in a bit of awkwardness, but I'll fix that shortly. BUG=611563 TEST=covered by tests R=ben@chromium.org Committed: https://crrev.com/1cc6966e3f846069257522bedb9c3f9315386d02 Cr-Commit-Position: refs/heads/master@{#400546}

Patch Set 1 #

Patch Set 2 : tweaks #

Patch Set 3 : deps #

Patch Set 4 : override #

Patch Set 5 : override #

Patch Set 6 : unused #

Patch Set 7 : include #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1482 lines, -1311 lines) Patch
M ash/mus/accelerator_registrar_impl.h View 4 chunks +5 lines, -15 lines 0 comments Download
M ash/mus/accelerator_registrar_impl.cc View 7 chunks +13 lines, -50 lines 0 comments Download
M ash/mus/bridge/wm_window_mus.h View 1 chunk +3 lines, -0 lines 0 comments Download
M ash/mus/bridge/wm_window_mus.cc View 1 chunk +4 lines, -0 lines 0 comments Download
M ash/mus/disconnected_app_handler.h View 1 2 3 4 1 chunk +3 lines, -2 lines 0 comments Download
M ash/mus/disconnected_app_handler.cc View 1 chunk +51 lines, -2 lines 0 comments Download
M ash/mus/manifest.json View 1 chunk +1 line, -1 line 0 comments Download
M ash/mus/root_window_controller.h View 5 chunks +21 lines, -54 lines 0 comments Download
M ash/mus/root_window_controller.cc View 1 2 3 4 5 6 6 chunks +91 lines, -120 lines 0 comments Download
M ash/mus/root_windows_observer.h View 1 chunk +5 lines, -2 lines 0 comments Download
M ash/mus/test/wm_test_base.cc View 1 chunk +3 lines, -2 lines 0 comments Download
M ash/mus/test/wm_test_helper.cc View 1 2 3 4 5 2 chunks +17 lines, -14 lines 0 comments Download
M ash/mus/window_manager.h View 2 chunks +74 lines, -20 lines 0 comments Download
M ash/mus/window_manager.cc View 4 chunks +138 lines, -119 lines 0 comments Download
M ash/mus/window_manager_application.h View 1 5 chunks +20 lines, -48 lines 0 comments Download
M ash/mus/window_manager_application.cc View 1 6 chunks +63 lines, -91 lines 0 comments Download
M components/mus/demo/manifest.json View 1 chunk +1 line, -1 line 0 comments Download
M components/mus/demo/mus_demo.h View 1 5 chunks +3 lines, -14 lines 0 comments Download
M components/mus/demo/mus_demo.cc View 1 4 chunks +27 lines, -28 lines 0 comments Download
M components/mus/mus_app.h View 3 chunks +5 lines, -4 lines 0 comments Download
M components/mus/mus_app.cc View 2 chunks +3 lines, -3 lines 0 comments Download
M components/mus/public/cpp/BUILD.gn View 1 chunk +1 line, -0 lines 0 comments Download
M components/mus/public/cpp/lib/in_flight_change.cc View 1 chunk +1 line, -0 lines 0 comments Download
M components/mus/public/cpp/lib/window_tree_client.cc View 6 chunks +61 lines, -6 lines 0 comments Download
M components/mus/public/cpp/tests/BUILD.gn View 1 2 1 chunk +1 line, -0 lines 0 comments Download
M components/mus/public/cpp/tests/test_window_tree_client_setup.h View 3 chunks +13 lines, -4 lines 0 comments Download
M components/mus/public/cpp/tests/test_window_tree_client_setup.cc View 3 chunks +21 lines, -6 lines 0 comments Download
M components/mus/public/cpp/tests/window_server_test_base.h View 1 chunk +1 line, -0 lines 0 comments Download
M components/mus/public/cpp/tests/window_server_test_base.cc View 1 chunk +6 lines, -0 lines 0 comments Download
M components/mus/public/cpp/tests/window_tree_client_private.h View 2 chunks +11 lines, -0 lines 0 comments Download
M components/mus/public/cpp/tests/window_tree_client_private.cc View 3 chunks +20 lines, -0 lines 0 comments Download
M components/mus/public/cpp/window_manager_delegate.h View 2 chunks +9 lines, -0 lines 0 comments Download
M components/mus/public/cpp/window_tree_client.h View 1 2 3 6 chunks +36 lines, -1 line 0 comments Download
M components/mus/public/cpp/window_tree_client_delegate.h View 1 chunk +1 line, -13 lines 0 comments Download
M components/mus/public/interfaces/BUILD.gn View 1 chunk +2 lines, -1 line 0 comments Download
M components/mus/public/interfaces/window_manager.mojom View 2 chunks +8 lines, -0 lines 0 comments Download
D components/mus/public/interfaces/window_manager_factory.mojom View 1 chunk +0 lines, -23 lines 0 comments Download
A components/mus/public/interfaces/window_manager_window_tree_factory.mojom View 1 1 chunk +16 lines, -0 lines 0 comments Download
M components/mus/public/interfaces/window_tree.mojom View 1 chunk +1 line, -37 lines 0 comments Download
A components/mus/public/interfaces/window_tree_constants.mojom View 1 chunk +49 lines, -0 lines 0 comments Download
M components/mus/test_wm/manifest.json View 1 chunk +1 line, -1 line 0 comments Download
M components/mus/test_wm/test_wm.cc View 1 3 chunks +25 lines, -25 lines 0 comments Download
M components/mus/ws/BUILD.gn View 1 chunk +5 lines, -5 lines 0 comments Download
M components/mus/ws/cursor_unittest.cc View 2 chunks +3 lines, -4 lines 0 comments Download
M components/mus/ws/display.h View 4 chunks +9 lines, -8 lines 0 comments Download
M components/mus/ws/display.cc View 4 chunks +21 lines, -19 lines 0 comments Download
M components/mus/ws/display_unittest.cc View 8 chunks +48 lines, -76 lines 0 comments Download
M components/mus/ws/test_utils.h View 5 chunks +16 lines, -23 lines 0 comments Download
M components/mus/ws/test_utils.cc View 4 chunks +21 lines, -25 lines 0 comments Download
M components/mus/ws/user_display_manager.cc View 2 chunks +4 lines, -9 lines 0 comments Download
M components/mus/ws/user_display_manager_unittest.cc View 5 chunks +12 lines, -13 lines 0 comments Download
M components/mus/ws/window_manager_client_unittest.cc View 1 chunk +2 lines, -0 lines 0 comments Download
D components/mus/ws/window_manager_factory_registry.h View 1 chunk +0 lines, -79 lines 0 comments Download
D components/mus/ws/window_manager_factory_registry.cc View 1 chunk +0 lines, -112 lines 0 comments Download
D components/mus/ws/window_manager_factory_registry_observer.h View 1 chunk +0 lines, -27 lines 0 comments Download
D components/mus/ws/window_manager_factory_service.h View 1 chunk +0 lines, -65 lines 0 comments Download
D components/mus/ws/window_manager_factory_service.cc View 1 chunk +0 lines, -53 lines 0 comments Download
A components/mus/ws/window_manager_window_tree_factory.h View 1 chunk +75 lines, -0 lines 0 comments Download
A components/mus/ws/window_manager_window_tree_factory.cc View 1 chunk +89 lines, -0 lines 0 comments Download
A components/mus/ws/window_manager_window_tree_factory_set.h View 1 chunk +94 lines, -0 lines 0 comments Download
A components/mus/ws/window_manager_window_tree_factory_set.cc View 1 chunk +107 lines, -0 lines 0 comments Download
A components/mus/ws/window_manager_window_tree_factory_set_observer.h View 1 chunk +26 lines, -0 lines 0 comments Download
M components/mus/ws/window_server.h View 6 chunks +19 lines, -13 lines 0 comments Download
M components/mus/ws/window_server.cc View 6 chunks +33 lines, -30 lines 0 comments Download
M components/mus/ws/window_tree.h View 2 chunks +3 lines, -1 line 0 comments Download
M components/mus/ws/window_tree.cc View 7 chunks +50 lines, -38 lines 0 comments Download
M components/mus/ws/window_tree_binding.h View 1 chunk +4 lines, -3 lines 0 comments Download
M components/mus/ws/window_tree_client_unittest.cc View 2 chunks +6 lines, -1 line 0 comments Download

Messages

Total messages: 12 (6 generated)
sky
wfh for *.mojom ben: for rest
4 years, 6 months ago (2016-06-17 19:49:10 UTC) #3
Ben Goodger (Google)
lgtm
4 years, 6 months ago (2016-06-17 21:54:05 UTC) #4
Will Harris
security lgtm rs for *mojom.
4 years, 6 months ago (2016-06-17 22:24:37 UTC) #5
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/2072343002/120001
4 years, 6 months ago (2016-06-17 22:57:02 UTC) #8
commit-bot: I haz the power
Committed patchset #7 (id:120001)
4 years, 6 months ago (2016-06-17 23:59:48 UTC) #10
commit-bot: I haz the power
4 years, 6 months ago (2016-06-18 00:02:00 UTC) #12
Message was sent while issue was closed.
Patchset 7 (id:??) landed as
https://crrev.com/1cc6966e3f846069257522bedb9c3f9315386d02
Cr-Commit-Position: refs/heads/master@{#400546}

Powered by Google App Engine
This is Rietveld 408576698