Now that we've enabled most of simplified display management for mushrome we should enable it for mash. I'm marking this blocked on 706589 as this should really wait until simplified display management is solid for mushrome.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/97853258c546808df7ba51746b878ee8294a72a6 commit 97853258c546808df7ba51746b878ee8294a72a6 Author: sky <sky@chromium.org> Date: Sun May 21 15:31:53 2017 Updates display.mojom to include more of Display There were a couple of values not being written. This updates the mojom and traits appropriately. BUG= 718860 TEST=covered by tests R=tsepez@chromium.org Review-Url: https://codereview.chromium.org/2894763003 Cr-Commit-Position: refs/heads/master@{#473473} [modify] https://crrev.com/97853258c546808df7ba51746b878ee8294a72a6/ui/display/mojo/display.mojom [modify] https://crrev.com/97853258c546808df7ba51746b878ee8294a72a6/ui/display/mojo/display_struct_traits.cc [modify] https://crrev.com/97853258c546808df7ba51746b878ee8294a72a6/ui/display/mojo/display_struct_traits.h [modify] https://crrev.com/97853258c546808df7ba51746b878ee8294a72a6/ui/display/mojo/display_struct_traits_unittest.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/e960d804c101b2a04363712e99ae5c91db53e05a commit e960d804c101b2a04363712e99ae5c91db53e05a Author: Scott Violet <sky@chromium.org> Date: Thu Jun 01 21:10:59 2017 mash: don't try to use QuirksManager in mash Chrome creates QuirksManager, so that when mash tries to access QuirksManager we get a crash. BUG=728748, 718860 TEST=none R=kylechar@chromium.org Change-Id: I13f33abde92cb13048542469440f5ab8cc562e00 Reviewed-on: https://chromium-review.googlesource.com/521922 Reviewed-by: kylechar <kylechar@chromium.org> Commit-Queue: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/master@{#476436} [modify] https://crrev.com/e960d804c101b2a04363712e99ae5c91db53e05a/ash/display/display_color_manager_chromeos.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456 commit d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456 Author: Scott Violet <sky@chromium.org> Date: Sat Jun 03 03:14:20 2017 chromeos: adds AshDisplayController and wires up ChromeConsoleServiceProviderDelegate to use it. I will get rid of MusConsoleServiceProviderDelegate soon, but can't until simplified display management is enabled for --mash. BUG= 718860 TEST=none Change-Id: I055806ab5f85238ad8b69e87143ea4e795fafa07 Reviewed-on: https://chromium-review.googlesource.com/522545 Commit-Queue: Scott Violet <sky@chromium.org> Reviewed-by: kylechar <kylechar@chromium.org> Reviewed-by: Tom Sepez <tsepez@chromium.org> Reviewed-by: Dan Erat <derat@chromium.org> Cr-Commit-Position: refs/heads/master@{#476881} [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ash/BUILD.gn [add] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ash/display/ash_display_controller.cc [add] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ash/display/ash_display_controller.h [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ash/mojo_interface_factory.cc [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ash/mus/manifest.json [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ash/public/interfaces/BUILD.gn [add] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ash/public/interfaces/ash_display_controller.mojom [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ash/shell.cc [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ash/shell.h [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/chrome/browser/chrome_content_browser_manifest_overlay.json [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/chrome/browser/chromeos/chrome_browser_main_chromeos.cc [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/chrome/browser/chromeos/chrome_browser_main_chromeos.h [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.cc [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate.h [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/content/public/app/mojo/content_browser_manifest.json [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ui/display/manager/chromeos/display_configurator.cc [modify] https://crrev.com/d64dac1052cfde3ddba4d1e5e6d1cdb2f9b5b456/ui/display/manager/chromeos/display_configurator.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/2c5eae86eddc741f7619898863ab70d89a29f39e commit 2c5eae86eddc741f7619898863ab70d89a29f39e Author: sky <sky@chromium.org> Date: Tue Jun 06 01:46:58 2017 chromeos: turn on simplified display management for mash I'm going to keep the function to determine if enabled. Assuming there aren't any issues after a couple of days I'll do a cleanup pass. BUG= 718860 TEST=none R=msw@chromium.org Review-Url: https://codereview.chromium.org/2906873003 Cr-Commit-Position: refs/heads/master@{#477150} [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/ash/mus/BUILD.gn [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/ash/mus/bridge/shell_port_mash.cc [delete] https://crrev.com/0c48bd0b9de9870c4b9ea8a900eba23bab196aba/ash/mus/screen_mus_unittest.cc [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/ash/mus/window_manager.cc [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/ash/mus/window_manager_application.cc [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/ash/rotator/screen_rotation_animator_unittest.cc [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/ash/shell.cc [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/ash/shell.h [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/ash/test/ash_test_base.cc [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/ash/test/ash_test_helper.cc [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/chrome/browser/chromeos/BUILD.gn [modify] https://crrev.com/2c5eae86eddc741f7619898863ab70d89a29f39e/chrome/browser/chromeos/chrome_browser_main_chromeos.cc [delete] https://crrev.com/0c48bd0b9de9870c4b9ea8a900eba23bab196aba/chrome/browser/chromeos/dbus/mus_console_service_provider_delegate.cc [delete] https://crrev.com/0c48bd0b9de9870c4b9ea8a900eba23bab196aba/chrome/browser/chromeos/dbus/mus_console_service_provider_delegate.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/596bb46345c755ac777efae231a56afa26121283 commit 596bb46345c755ac777efae231a56afa26121283 Author: Scott Violet <sky@chromium.org> Date: Wed Jun 21 19:45:36 2017 chromeos: removes complex display management path We never really called it complex, but as we named the new code 'simplified' it seems complex is a good name for the old. Anyway, this removes all the now dead code related to the complex display management code path. BUG= 706589 , 718860 TEST=covered by tests Change-Id: Icadd7ba9a56c29c47d5615aaf51bfbb28e69f5d5 Reviewed-on: https://chromium-review.googlesource.com/541060 Reviewed-by: James Cook <jamescook@chromium.org> Commit-Queue: Scott Violet <sky@chromium.org> Cr-Commit-Position: refs/heads/master@{#481280} [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/DEPS [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/app_list/app_list_delegate_impl.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/app_list/app_list_presenter_delegate.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/aura/shell_port_classic.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/aura/shell_port_classic.h [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/display/cursor_window_controller.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/display/display_configuration_controller.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/display/extended_mouse_warp_controller.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/display/screen_orientation_controller_chromeos.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/mus/BUILD.gn [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/mus/bridge/shell_port_mash.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/mus/bridge/shell_port_mash.h [delete] https://crrev.com/1d75a1d92beee4cb3a492375d5f55094b7f82229/ash/mus/screen_mus.cc [delete] https://crrev.com/1d75a1d92beee4cb3a492375d5f55094b7f82229/ash/mus/screen_mus.h [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/mus/window_manager.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/mus/window_manager.h [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/mus/window_manager_application.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/root_window_controller.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/rotator/screen_rotation_animator.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/rotator/screen_rotation_animator_unittest.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/screen_util.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/shelf/shelf_layout_manager.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/shelf/shelf_view_unittest.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/shelf/shelf_window_watcher.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/shell.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/shell.h [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/shell/window_watcher.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/shell_init_params.h [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/shell_port.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/shell_port.h [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/sticky_keys/sticky_keys_overlay_unittest.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/system/audio/tray_audio.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/system/overview/overview_button_tray_unittest.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/system/rotation/tray_rotation_lock.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/test/ash_test_base.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/test/ash_test_helper.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/test/ash_test_helper.h [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/touch/touch_observer_hud.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/touch/touch_observer_hud_unittest.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/utility/screenshot_controller.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/wallpaper/wallpaper_controller.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/wallpaper/wallpaper_view.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/wm/drag_window_controller.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/wm/maximize_mode/maximize_mode_controller.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/wm/window_util.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/wm/workspace/workspace_layout_manager_keyboard_unittest.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/ash/wm/workspace/workspace_layout_manager_unittest.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/chrome/browser/chromeos/display/overscan_calibrator.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/chrome/browser/chromeos/display/touch_calibrator/touch_calibrator_view.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/chrome/browser/chromeos/ui/accessibility_cursor_ring_layer.cc [modify] https://crrev.com/596bb46345c755ac777efae231a56afa26121283/chrome/browser/chromeos/ui/accessibility_focus_ring_layer.cc
This is enabled and I'm calling it done. There is one remaining issue, 647421, but that can be fixed separately.
Comment 1 by sky@chromium.org
, May 5 2017