There's some code in the shelf I left to keep ash_sysui working while we convert to the combined sysui/wm service. TODOs: * Remove WmShelf::OnStatusAreaMouseEvent and GestureEvent, left over from ash_sysui autohide support.
There is also code to hide the StatusAreaWidget in sysui (when Shell::GetInstance()->in_mus() is true) now that it has been ported to mojo:ash.
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/e2dd2245e3707d5ff18b3186192f00253c04598f commit e2dd2245e3707d5ff18b3186192f00253c04598f Author: msw <msw@chromium.org> Date: Tue Aug 09 20:53:31 2016 mash: Move AutoHideEventHandler to WmShelfAura. Manage an AutoHideEventHandler instance in WmShelfAura. Send the target window to UpdateAutoHideFor*Event. Move in_mouse_drag_ to ShelfLayoutManager. Remove WmShelf::UpdateAutoHideFor*Event helpers. Remove shelf/status Widget event handler overrides. (this disables auto-hide for mash, needs implementation) (partly reverts https://codereview.chromium.org/2109193002) BUG= 615155 , 621112 , 631216 TEST=Automated; no auto-hide changes in non-mash ChromeOS. R=jamescook@chromium.org Review-Url: https://codereview.chromium.org/2227143003 Cr-Commit-Position: refs/heads/master@{#410813} [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/aura/wm_shelf_aura.cc [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/aura/wm_shelf_aura.h [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/common/shelf/wm_shelf.h [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/common/system/status_area_widget.cc [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/common/system/status_area_widget.h [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/mus/bridge/wm_shelf_mus.cc [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/mus/bridge/wm_shelf_mus.h [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/shelf/shelf_layout_manager.cc [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/shelf/shelf_layout_manager.h [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/shelf/shelf_widget.cc [modify] https://crrev.com/e2dd2245e3707d5ff18b3186192f00253c04598f/ash/shelf/shelf_widget.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/c5513e3d979bd1eecb221405a1fae007f38ae3c2 commit c5513e3d979bd1eecb221405a1fae007f38ae3c2 Author: jamescook <jamescook@chromium.org> Date: Wed Aug 10 15:42:32 2016 Show the status area widget in mash This code will need to change when ShelfLayoutManager is working in mash, but for now it gets something on the screen. BUG= 615155 , 621112 TEST=none Review-Url: https://codereview.chromium.org/2230083002 Cr-Commit-Position: refs/heads/master@{#411046} [modify] https://crrev.com/c5513e3d979bd1eecb221405a1fae007f38ae3c2/ash/mus/root_window_controller.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/7025b343bb1a6bdf97242a09c10e6b0633a140f4 commit 7025b343bb1a6bdf97242a09c10e6b0633a140f4 Author: jamescook <jamescook@chromium.org> Date: Wed Aug 10 16:29:08 2016 Revert of Show the status area widget in mash (patchset #1 id:1 of https://codereview.chromium.org/2230083002/ ) Reason for revert: This doesn't work due to ash_sysui no longer running https://codereview.chromium.org/2235493002/. I'm going to revert and land a patch that works. Original issue's description: > Show the status area widget in mash > > This code will need to change when ShelfLayoutManager is working in mash, but > for now it gets something on the screen. > > BUG= 615155 , 621112 > TEST=none > > Committed: https://crrev.com/c5513e3d979bd1eecb221405a1fae007f38ae3c2 > Cr-Commit-Position: refs/heads/master@{#411046} TBR=msw@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= 615155 , 621112 Review-Url: https://codereview.chromium.org/2233753003 Cr-Commit-Position: refs/heads/master@{#411051} [modify] https://crrev.com/7025b343bb1a6bdf97242a09c10e6b0633a140f4/ash/mus/root_window_controller.cc
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/03c3e2fdc5e5a2a9b682e4e88a1a2e2394468ed7 commit 03c3e2fdc5e5a2a9b682e4e88a1a2e2394468ed7 Author: jamescook <jamescook@chromium.org> Date: Fri Aug 12 02:35:09 2016 mash: Show status area widget, attempt 2 * Create the widget in RootWindowController initialization * Removed unused mus version of StatusLayoutManager BUG= 615155 , 621112 TEST=none Review-Url: https://codereview.chromium.org/2230723003 Cr-Commit-Position: refs/heads/master@{#411526} [modify] https://crrev.com/03c3e2fdc5e5a2a9b682e4e88a1a2e2394468ed7/ash/mus/BUILD.gn [modify] https://crrev.com/03c3e2fdc5e5a2a9b682e4e88a1a2e2394468ed7/ash/mus/bridge/wm_shelf_mus.cc [modify] https://crrev.com/03c3e2fdc5e5a2a9b682e4e88a1a2e2394468ed7/ash/mus/bridge/wm_shelf_mus.h [modify] https://crrev.com/03c3e2fdc5e5a2a9b682e4e88a1a2e2394468ed7/ash/mus/bridge/wm_shell_mus.cc [modify] https://crrev.com/03c3e2fdc5e5a2a9b682e4e88a1a2e2394468ed7/ash/mus/root_window_controller.cc [modify] https://crrev.com/03c3e2fdc5e5a2a9b682e4e88a1a2e2394468ed7/ash/mus/root_window_controller.h [delete] https://crrev.com/ee942d7dd807187c7edded0196e92fe3fc402995/ash/mus/status_layout_manager.cc [delete] https://crrev.com/ee942d7dd807187c7edded0196e92fe3fc402995/ash/mus/status_layout_manager.h
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/ccb5d69efde4c915618f8334fa4a5231a09d3bb7 commit ccb5d69efde4c915618f8334fa4a5231a09d3bb7 Author: msw <msw@chromium.org> Date: Wed Aug 17 20:37:48 2016 mash: Create and show a shelf in mash. Allow mash to use the shelf, widget, and layout manager. Delay moving files to ease oshima's concurrent Shelf CL. Consolidate WmShelf[Aura|Mus] functionality on WmShelf. WmShelfMus ctor inits Shelf, ShelfView, ShelfWidget, etc. Use a ShelfDelegateStub for now; add TODO for real impl. WmShelfAura still uses root event handlers; shelf dimmer. Nix ShelfIconObserver interface; use WmShelfObserver. Nix redundant mash RootWindowController::CreateStatusArea. Change ShelfWidget's WmShelfAura* member to WmShelf*. Call WmShell::ShutDown before destruction in WindowManager. Teardown PointerWatcherEventRouter after window destruction. BUG= 557406 , 612631 , 615155 , 621112 TEST=Automated; no cros changes; chrome --mash has a shelf. R=jamescook@chromium.org,sky@chromium.org Review-Url: https://codereview.chromium.org/2247503002 Cr-Commit-Position: refs/heads/master@{#412630} [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/app_list/app_list_presenter_delegate.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/app_list/app_list_presenter_delegate.h [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/ash.gyp [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/aura/wm_shelf_aura.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/aura/wm_shelf_aura.h [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/common/shelf/DEPS [delete] https://crrev.com/8b8b2cd33a7685b4b4d51e3d778073be4b526897/ash/common/shelf/shelf_icon_observer.h [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/common/shelf/shelf_view.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/common/shelf/shelf_view.h [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/common/shelf/wm_shelf.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/common/shelf/wm_shelf.h [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/common/wm_shell.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/common/wm_shell.h [add] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/mus/bridge/DEPS [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/mus/bridge/wm_shelf_mus.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/mus/bridge/wm_shelf_mus.h [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/mus/root_window_controller.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/mus/root_window_controller.h [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/mus/shell_delegate_mus.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/mus/window_manager.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/root_window_controller.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/shelf/shelf.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/shelf/shelf.h [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/shelf/shelf_view_unittest.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/shelf/shelf_widget.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/shelf/shelf_widget.h [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ui/views/mus/pointer_watcher_event_router.cc [modify] https://crrev.com/ccb5d69efde4c915618f8334fa4a5231a09d3bb7/ui/views/mus/pointer_watcher_event_router.h
The code has been removed as part of other shelf cleanup.
Comment 1 by jamescook@chromium.org
, Jul 15 2016