We only have ShellPortClassic at this point, so there is no point in keeping it. Instead we should fold the code back into the places that are using ShellPort and nuke ShellPort entirely. This includes removing ShellPort from ShellInitParams.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/698fc366f8938ada65f8089b584f615680f20dca commit 698fc366f8938ada65f8089b584f615680f20dca Author: James Cook <jamescook@chromium.org> Date: Fri Jul 27 16:05:01 2018 cros: Clean up ash::ShellPort cursor methods We no longer have mash vs. classic configs in ash, and there's only one implementation of ShellPort. As a step towards eliminating ShellPort, remove the cursor handling methods from it. Also clean up some code that checks to see if we have a cursor manager -- ash always has one, for the lifetime of Shell. This manually reverts parts of https://codereview.chromium.org/2857963003/ Bug: 866523 Test: ash_unittests Change-Id: Ic905b26587af6c2cebdd4fcbcf07f85d69515d1e Reviewed-on: https://chromium-review.googlesource.com/1152544 Reviewed-by: Evan Stade <estade@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#578661} [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/accessibility/accessibility_controller.cc [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/magnifier/magnification_controller.cc [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/shell.cc [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/shell.h [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/shell_port.h [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/shell_port_classic.cc [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/shell_port_classic.h [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/utility/screenshot_controller.cc [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/wm/default_window_resizer.cc [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/wm/immersive_context_ash.cc [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/wm/lock_state_controller.cc [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/wm/tablet_mode/tablet_mode_browser_window_drag_controller.cc [modify] https://crrev.com/698fc366f8938ada65f8089b584f615680f20dca/ash/wm/workspace/workspace_window_resizer.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/387d96762692aa943bef66e2753b39fc2167c8c2 commit 387d96762692aa943bef66e2753b39fc2167c8c2 Author: James Cook <jamescook@chromium.org> Date: Mon Jul 30 15:51:27 2018 cros: Remove lock state methods from ash::ShellPort We no longer have mash vs. classic configs in ash, and there's only one implementation of ShellPort. As a step towards eliminating ShellPort, remove the lock state methods from it. Bug: 866425 Test: ash_unittests Change-Id: I8c02c89b62ef43a1f14727e0baae79d07ed3c4b5 Reviewed-on: https://chromium-review.googlesource.com/1153844 Reviewed-by: Michael Wasserman <msw@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#579049} [modify] https://crrev.com/387d96762692aa943bef66e2753b39fc2167c8c2/ash/shelf/shelf_layout_manager.cc [modify] https://crrev.com/387d96762692aa943bef66e2753b39fc2167c8c2/ash/shelf/shelf_locking_manager.cc [modify] https://crrev.com/387d96762692aa943bef66e2753b39fc2167c8c2/ash/shell_port.cc [modify] https://crrev.com/387d96762692aa943bef66e2753b39fc2167c8c2/ash/shell_port.h [modify] https://crrev.com/387d96762692aa943bef66e2753b39fc2167c8c2/ash/system/power/power_button_controller.cc [modify] https://crrev.com/387d96762692aa943bef66e2753b39fc2167c8c2/ash/wm/lock_state_controller.cc [modify] https://crrev.com/387d96762692aa943bef66e2753b39fc2167c8c2/ash/wm/lock_state_controller.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/9db56d73f120a061216c56c7e4a12f6ee7e42d17 commit 9db56d73f120a061216c56c7e4a12f6ee7e42d17 Author: James Cook <jamescook@chromium.org> Date: Wed Aug 01 03:21:31 2018 chromeos: Remove factory methods from ash::ShellPort We no longer have mash vs. classic configs in ash, and there's only one implementation of ShellPort. As a step towards eliminating ShellPort, remove the object factory methods from it. Keep CreatePointerWatcherAdapter for now because that will require more general PointerWatcher cleanup. Bug: 866523 Test: ash_unittests Change-Id: Iff2c3898932389ebc7eeb253ca4eb046da35e641 Reviewed-on: https://chromium-review.googlesource.com/1157688 Commit-Queue: James Cook <jamescook@chromium.org> Reviewed-by: Michael Wasserman <msw@chromium.org> Cr-Commit-Position: refs/heads/master@{#579683} [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/accelerators/accelerator_controller.h [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/host/ash_window_tree_host.cc [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/shell.cc [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/shell_port.h [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/shell_port_classic.cc [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/shell_port_classic.h [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/wm/drag_window_resizer.cc [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/wm/drag_window_resizer.h [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/wm/tablet_mode/tablet_mode_event_handler_classic.h [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/wm/tablet_mode/tablet_mode_window_manager.cc [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/wm/window_cycle_controller.cc [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/wm/window_cycle_event_filter_classic.h [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/wm/workspace/workspace_window_resizer.cc [modify] https://crrev.com/9db56d73f120a061216c56c7e4a12f6ee7e42d17/ash/wm/workspace_controller.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/602164ef01ff30ddba3e4b293c6fe34c8e507f3b commit 602164ef01ff30ddba3e4b293c6fe34c8e507f3b Author: James Cook <jamescook@chromium.org> Date: Tue Aug 07 20:39:42 2018 chromeos: Remove more ash::ShellPort methods The class is deprecated. Eliminate empty methods. Inline code from remaining methods. TBR=rcui@chromium.org Bug: 866523 Change-Id: I6c785a5c58b4b95f2a3b543ab80b66610fc88519 Reviewed-on: https://chromium-review.googlesource.com/1164629 Reviewed-by: James Cook <jamescook@chromium.org> Commit-Queue: James Cook <jamescook@chromium.org> Cr-Commit-Position: refs/heads/master@{#581334} [modify] https://crrev.com/602164ef01ff30ddba3e4b293c6fe34c8e507f3b/ash/DEPS [modify] https://crrev.com/602164ef01ff30ddba3e4b293c6fe34c8e507f3b/ash/root_window_controller.cc [modify] https://crrev.com/602164ef01ff30ddba3e4b293c6fe34c8e507f3b/ash/shell.cc [modify] https://crrev.com/602164ef01ff30ddba3e4b293c6fe34c8e507f3b/ash/shell/app_list.cc [modify] https://crrev.com/602164ef01ff30ddba3e4b293c6fe34c8e507f3b/ash/shell_init_params.cc [modify] https://crrev.com/602164ef01ff30ddba3e4b293c6fe34c8e507f3b/ash/shell_port.h [modify] https://crrev.com/602164ef01ff30ddba3e4b293c6fe34c8e507f3b/ash/shell_port_classic.cc [modify] https://crrev.com/602164ef01ff30ddba3e4b293c6fe34c8e507f3b/ash/shell_port_classic.h [modify] https://crrev.com/602164ef01ff30ddba3e4b293c6fe34c8e507f3b/ash/system/ime_menu/ime_list_view.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/fa4838e348986253ec6bc07959d61d1927d447f5 commit fa4838e348986253ec6bc07959d61d1927d447f5 Author: James Cook <jamescook@chromium.org> Date: Wed Aug 08 16:30:15 2018 chromeos: Delete ash::ShellPort The class is deprecated since mash switched to //services/ui/ws2. Inline the remaining code and delete the class. TBR=sky@chromium.org TBR=reveman@chromium.org Bug: 866523 Change-Id: I1b13483cf33abfeb8236a122a60b22c0372e6371 Reviewed-on: https://chromium-review.googlesource.com/1166235 Commit-Queue: James Cook <jamescook@chromium.org> Reviewed-by: Jun Mukai <mukai@chromium.org> Cr-Commit-Position: refs/heads/master@{#581587} [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/BUILD.gn [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/app_list/app_list_controller_impl.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/app_list/app_list_presenter_delegate_unittest.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/ash_service.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/host/DEPS [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/metrics/pointer_metrics_recorder.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/pointer_watcher_adapter_classic.h [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/pointer_watcher_adapter_classic_unittest.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/public/cpp/immersive/immersive_context.h [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/shelf/overflow_bubble.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/shelf/shelf_tooltip_manager.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/shelf/shelf_view.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/shell.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/shell.h [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/shell/app_list.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/shell/content/client/shell_browser_main_parts.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/shell_init_params.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/shell_init_params.h [delete] https://crrev.com/a78cf8ea88d186c78ddbf087f6d2d9dbbc6d1bd9/ash/shell_port.cc [delete] https://crrev.com/a78cf8ea88d186c78ddbf087f6d2d9dbbc6d1bd9/ash/shell_port.h [delete] https://crrev.com/a78cf8ea88d186c78ddbf087f6d2d9dbbc6d1bd9/ash/shell_port_classic.cc [delete] https://crrev.com/a78cf8ea88d186c78ddbf087f6d2d9dbbc6d1bd9/ash/shell_port_classic.h [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/shutdown_controller.h [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/system/keyboard_brightness/tray_keyboard_brightness.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/system/palette/palette_tray.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/system/palette/palette_welcome_bubble.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/system/tray/system_tray.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/system/tray/system_tray_bubble.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/system/tray/tray_event_filter.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/test/ash_test_helper.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/utility/screenshot_controller.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/wallpaper/wallpaper_view.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/wm/immersive_context_ash.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/wm/lock_state_controller.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/ash/wm/system_modal_container_layout_manager.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/chrome/browser/chromeos/chrome_browser_main_chromeos.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/chrome/browser/ui/ash/ash_shell_init.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/chrome/test/base/view_event_test_platform_part_chromeos.cc [modify] https://crrev.com/fa4838e348986253ec6bc07959d61d1927d447f5/components/exo/shell_surface_unittest.cc
Comment 1 by jamescook@chromium.org
, Jul 26Labels: Proj-Mustash
Owner: jamescook@chromium.org
Status: Started (was: Untriaged)