You can't run this config anymore. We still need to keep Config::MASH, though, so we'll need to sort out the shared code (e.g. ShellPortMash is-a ShellPortMus).
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/6723db3cc7550d3af96a1981442f09f944b6a8f8 commit 6723db3cc7550d3af96a1981442f09f944b6a8f8 Author: James Cook <jamescook@chromium.org> Date: Tue May 22 21:09:56 2018 chromeos: Remove ash::Config::MUS, part 1 We removed --enable-features=kMus a few weeks ago while switching to "ws2" window service as a library. Ash never runs in ash::Config::MUS. Remove the WindowManagerService, WindowManager and Shell initialization code paths that supported Config::MUS. There are still a few other places to clean up but they require more inspection. Bug: 841941 Test: bots, chrome --enable-features=Mash still runs Change-Id: Ic6fbe6bf329c6d44a4d652633ed9e2cd946c977e Reviewed-on: https://chromium-review.googlesource.com/1068212 Reviewed-by: Scott Violet <sky@chromium.org> Reviewed-by: Michael Wasserman <msw@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#560776} [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ash/magnifier/docked_magnifier_controller_unittest.cc [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ash/shell.cc [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ash/shell_delegate_mus.h [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ash/shell_port_mus.h [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ash/test/ash_test_helper.cc [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ash/test/ash_test_helper.h [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ash/window_manager.cc [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ash/window_manager.h [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ash/window_manager_service.cc [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ash/window_manager_service.h [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/chrome/browser/ui/ash/ash_shell_init.cc [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/chrome/browser/ui/ash/ash_shell_init.h [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ui/aura/mus/window_tree_client.cc [modify] https://crrev.com/6723db3cc7550d3af96a1981442f09f944b6a8f8/ui/aura/mus/window_tree_client.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/f877d2bf928d9fd065b5cac9e07ececd982deead commit f877d2bf928d9fd065b5cac9e07ececd982deead Author: James Cook <jamescook@chromium.org> Date: Fri May 25 21:26:41 2018 chromeos: Fold ash::ShellPortMus into ShellPortMash We removed ash::Config::MUS as part of the switch to //services/ui/ws2. ShellPortMus isn't used independently anymore. Bug: 841941 Test: ash_unittests --enable-features=Mash Change-Id: I506a0526aebd8b90f07d654ceaad8f90891106cb Reviewed-on: https://chromium-review.googlesource.com/1072454 Commit-Queue: James Cook <jamescook@chromium.org> Reviewed-by: Michael Wasserman <msw@chromium.org> Cr-Commit-Position: refs/heads/master@{#562016} [modify] https://crrev.com/f877d2bf928d9fd065b5cac9e07ececd982deead/ash/BUILD.gn [modify] https://crrev.com/f877d2bf928d9fd065b5cac9e07ececd982deead/ash/DEPS [modify] https://crrev.com/f877d2bf928d9fd065b5cac9e07ececd982deead/ash/host/ash_window_tree_host_mus_mirroring_unified.h [modify] https://crrev.com/f877d2bf928d9fd065b5cac9e07ececd982deead/ash/host/ash_window_tree_host_mus_unified.h [modify] https://crrev.com/f877d2bf928d9fd065b5cac9e07ececd982deead/ash/shell_port_mash.cc [modify] https://crrev.com/f877d2bf928d9fd065b5cac9e07ececd982deead/ash/shell_port_mash.h [delete] https://crrev.com/bc93c95712b288d09f214d468e0921d58f3bc836/ash/shell_port_mus.cc [delete] https://crrev.com/bc93c95712b288d09f214d468e0921d58f3bc836/ash/shell_port_mus.h [modify] https://crrev.com/f877d2bf928d9fd065b5cac9e07ececd982deead/ash/test/ash_test_helper.cc [modify] https://crrev.com/f877d2bf928d9fd065b5cac9e07ececd982deead/ash/window_manager.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/0dd64bcc3f8949e7c01a6d91399f6f88d20104ef commit 0dd64bcc3f8949e7c01a6d91399f6f88d20104ef Author: James Cook <jamescook@chromium.org> Date: Fri May 25 23:03:45 2018 chromeos: Delete AshWindowTreeHostMusUnified This and AshWindowTreeHostMusMirroringUnified are unused now that we have deprecated ash::Config::MUS as part of the switch to //services/ui/ws2 Bug: 841941 Test: compiles Change-Id: I76cab0b5717b81eedfe168d67cf98ba0eac38abb Reviewed-on: https://chromium-review.googlesource.com/1074009 Reviewed-by: Michael Wasserman <msw@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#562051} [modify] https://crrev.com/0dd64bcc3f8949e7c01a6d91399f6f88d20104ef/ash/BUILD.gn [delete] https://crrev.com/bfc610d1a2a5f480c0f1111c2b321f02a3bbaa5f/ash/host/ash_window_tree_host_mus_mirroring_unified.cc [delete] https://crrev.com/bfc610d1a2a5f480c0f1111c2b321f02a3bbaa5f/ash/host/ash_window_tree_host_mus_mirroring_unified.h [delete] https://crrev.com/bfc610d1a2a5f480c0f1111c2b321f02a3bbaa5f/ash/host/ash_window_tree_host_mus_unified.cc [delete] https://crrev.com/bfc610d1a2a5f480c0f1111c2b321f02a3bbaa5f/ash/host/ash_window_tree_host_mus_unified.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/a1b75fbbf4c9d6668651b297bb61fec3fab78a1a commit a1b75fbbf4c9d6668651b297bb61fec3fab78a1a Author: James Cook <jamescook@chromium.org> Date: Tue May 29 15:50:32 2018 chromeos: Remove AshTestHelper::set_config() It was only used to support mus_unit_tests for Chrome. We don't support --mus / --enable-feature=Mus anymore, so remove it. This reverts commit b8f5ecbe1f808d4cf46cb4de709e6cfd2de23b20. Bug: 841941 Test: bots Change-Id: I48d68c1cc4c3e88d299b3dd4ecae1b8cceb71781 Reviewed-on: https://chromium-review.googlesource.com/1074003 Reviewed-by: Scott Violet <sky@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#562443} [modify] https://crrev.com/a1b75fbbf4c9d6668651b297bb61fec3fab78a1a/ash/test/ash_test_helper.h [modify] https://crrev.com/a1b75fbbf4c9d6668651b297bb61fec3fab78a1a/chrome/test/BUILD.gn [modify] https://crrev.com/a1b75fbbf4c9d6668651b297bb61fec3fab78a1a/chrome/test/base/chrome_unit_test_suite.cc [modify] https://crrev.com/a1b75fbbf4c9d6668651b297bb61fec3fab78a1a/chrome/test/base/chrome_unit_test_suite.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/cab80ea093f3daafa78fc309f3cb86f3196d8c0b commit cab80ea093f3daafa78fc309f3cb86f3196d8c0b Author: James Cook <jamescook@chromium.org> Date: Tue May 29 17:07:03 2018 chromeos: Rename ShellDelegateMus to ShellDelegateMash We no longer have a "mus" mode, and this delegate is used with mash, so name it appropriately. Bug: 841941 Test: compiles Change-Id: I9ad1260a73e550bd11a12a542eeebd2e35f18dd0 Reviewed-on: https://chromium-review.googlesource.com/1074089 Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#562468} [modify] https://crrev.com/cab80ea093f3daafa78fc309f3cb86f3196d8c0b/ash/BUILD.gn [rename] https://crrev.com/cab80ea093f3daafa78fc309f3cb86f3196d8c0b/ash/shell_delegate_mash.cc [rename] https://crrev.com/cab80ea093f3daafa78fc309f3cb86f3196d8c0b/ash/shell_delegate_mash.h [modify] https://crrev.com/cab80ea093f3daafa78fc309f3cb86f3196d8c0b/ash/window_manager.cc [modify] https://crrev.com/cab80ea093f3daafa78fc309f3cb86f3196d8c0b/ash/window_manager.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/a3bc78a4fdd27f362b735090970a096aa89d6995 commit a3bc78a4fdd27f362b735090970a096aa89d6995 Author: James Cook <jamescook@chromium.org> Date: Wed May 30 17:19:29 2018 chromeos: Rename BrowserFrameMus to BrowserFrameMash BrowserFrameMus and NonClientFrameViewMus are used with mash, so rename them appropriately. Linux ozone does not use mus any longer, so make the files only compile under chromeos. Bug: 841941 Test: browser_tests Change-Id: I740547e3715db2b43807b5a1706e32341ea0f712 Reviewed-on: https://chromium-review.googlesource.com/1077566 Commit-Queue: James Cook <jamescook@chromium.org> Reviewed-by: Michael Wasserman <msw@chromium.org> Cr-Commit-Position: refs/heads/master@{#562883} [modify] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/BUILD.gn [modify] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/BUILD.gn [rename] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/views/frame/browser_frame_mash.cc [rename] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/views/frame/browser_frame_mash.h [modify] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_chromeos.cc [modify] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc [rename] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/views/frame/browser_non_client_frame_view_mash.cc [rename] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/views/frame/browser_non_client_frame_view_mash.h [modify] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc [modify] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/views/frame/native_browser_frame_factory_aurax11.cc [modify] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc [modify] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/chrome/browser/ui/views/frame/native_browser_frame_factory_ozone.cc [modify] https://crrev.com/a3bc78a4fdd27f362b735090970a096aa89d6995/testing/buildbot/filters/mash.browser_tests.filter
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/fee11e90793631ad31c6475395a0889f308018ea commit fee11e90793631ad31c6475395a0889f308018ea Author: James Cook <jamescook@chromium.org> Date: Thu May 31 20:49:25 2018 chromeos: Remove ash::Config::MUS from NetworkStateNotifierTest We no longer support Config::MUS, so remove a reference to it. We don't currently run chrome unit_tests with mash, so it's not yet a problem in that config. Long term this will need to become a browser_test, or the notifier code will need to move. Bug: 841941 Change-Id: I883816c20e6121ab0126a8a669ec219a2a674ea9 Reviewed-on: https://chromium-review.googlesource.com/1079858 Reviewed-by: Steven Bennetts <stevenjb@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#563372} [modify] https://crrev.com/fee11e90793631ad31c6475395a0889f308018ea/chrome/browser/ui/ash/network/network_state_notifier_unittest.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/7b4f3c5aa43f2f5b1c77ce80477f261a2d4d8e93 commit 7b4f3c5aa43f2f5b1c77ce80477f261a2d4d8e93 Author: James Cook <jamescook@chromium.org> Date: Thu May 31 22:47:19 2018 aura: Remove TestWindowTree::NotifyClientAboutAcceleratedWidgets This was only used on chromeos for ash::Config::MUS. That configuration is no longer supported, so remove the function. Bug: 841941 Change-Id: I5f5c4d8c9c4137c0149922413856717443c7867d Reviewed-on: https://chromium-review.googlesource.com/1080391 Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#563414} [modify] https://crrev.com/7b4f3c5aa43f2f5b1c77ce80477f261a2d4d8e93/ash/test/ash_test_base.cc [modify] https://crrev.com/7b4f3c5aa43f2f5b1c77ce80477f261a2d4d8e93/ash/test/ash_test_helper.cc [modify] https://crrev.com/7b4f3c5aa43f2f5b1c77ce80477f261a2d4d8e93/ash/test/ash_test_helper.h [modify] https://crrev.com/7b4f3c5aa43f2f5b1c77ce80477f261a2d4d8e93/ui/aura/test/mus/test_window_tree.cc [modify] https://crrev.com/7b4f3c5aa43f2f5b1c77ce80477f261a2d4d8e93/ui/aura/test/mus/test_window_tree.h [modify] https://crrev.com/7b4f3c5aa43f2f5b1c77ce80477f261a2d4d8e93/ui/aura/test/mus/test_window_tree_client_setup.cc [modify] https://crrev.com/7b4f3c5aa43f2f5b1c77ce80477f261a2d4d8e93/ui/aura/test/mus/test_window_tree_client_setup.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/329c2a2fdedbcbb7990413100d4e59f57e53d8a4 commit 329c2a2fdedbcbb7990413100d4e59f57e53d8a4 Author: James Cook <jamescook@chromium.org> Date: Thu May 31 23:04:53 2018 chromeos: Remove NativeCursorManagerAshMus It was only used with Config::MUS, which we don't support any more. I left the base interface NativeCursorManagerAsh in case we need to introduce a NativeCursorManagerMash later for Config::MASH. Bug: 841941 Change-Id: Ia107cfbbcea0d52d2b2ada2f77c4017ab1bab8f7 Reviewed-on: https://chromium-review.googlesource.com/1080387 Commit-Queue: James Cook <jamescook@chromium.org> Reviewed-by: Evan Stade <estade@chromium.org> Cr-Commit-Position: refs/heads/master@{#563420} [modify] https://crrev.com/329c2a2fdedbcbb7990413100d4e59f57e53d8a4/ash/BUILD.gn [modify] https://crrev.com/329c2a2fdedbcbb7990413100d4e59f57e53d8a4/ash/shell.cc [modify] https://crrev.com/329c2a2fdedbcbb7990413100d4e59f57e53d8a4/ash/wm/native_cursor_manager_ash.h [delete] https://crrev.com/6bd83fb3074d792e49ce09435a5f412b2c1030b8/ash/wm/native_cursor_manager_ash_mus.cc [delete] https://crrev.com/6bd83fb3074d792e49ce09435a5f412b2c1030b8/ash/wm/native_cursor_manager_ash_mus.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/75800102558e55df6381be223a92e21a9705fd93 commit 75800102558e55df6381be223a92e21a9705fd93 Author: James Cook <jamescook@chromium.org> Date: Fri Jun 01 21:36:14 2018 chromeos: Remove ash::Config::MUS Config::MUS isn't used any more since --enable-features=Mus was deleted. We're switching to ws2 ("window service as a library"). Bug: 706913 , 837684 , 841941 Change-Id: Ifc05e369d558ede4f04692fe54eabc1e357c95b7 Reviewed-on: https://chromium-review.googlesource.com/1082916 Commit-Queue: James Cook <jamescook@chromium.org> Reviewed-by: Michael Wasserman <msw@chromium.org> Cr-Commit-Position: refs/heads/master@{#563806} [modify] https://crrev.com/75800102558e55df6381be223a92e21a9705fd93/ash/display/mirror_window_controller.cc [modify] https://crrev.com/75800102558e55df6381be223a92e21a9705fd93/ash/display/mirror_window_controller_unittest.cc [modify] https://crrev.com/75800102558e55df6381be223a92e21a9705fd93/ash/public/cpp/config.h [modify] https://crrev.com/75800102558e55df6381be223a92e21a9705fd93/ash/shell.cc [modify] https://crrev.com/75800102558e55df6381be223a92e21a9705fd93/ash/test/ash_test_base.h [modify] https://crrev.com/75800102558e55df6381be223a92e21a9705fd93/ash/window_manager.cc [modify] https://crrev.com/75800102558e55df6381be223a92e21a9705fd93/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h [modify] https://crrev.com/75800102558e55df6381be223a92e21a9705fd93/testing/buildbot/filters/mash.ash_unittests.filter
Comment 1 by jamescook@chromium.org
, May 21 2018Status: Started (was: Untriaged)