mash: Preliminary support for shelf auto-hide

ash/shelf/shelf_layout_manager.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
 
 #include <memory>
 #include <vector>
 
 #include "ash/ash_export.h"
 #include "ash/session/session_state_observer.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell_observer.h"
 #include "ash/snap_to_pixel_layout_manager.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/wm/common/background_animator.h"
 #include "ash/wm/common/dock/docked_window_layout_manager_observer.h"
 #include "ash/wm/common/workspace/workspace_types.h"
+#include "ash/wm/gestures/shelf_gesture_handler.h"
 #include "ash/wm/lock_state_observer.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "base/timer/timer.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller.h"
@@ skipping 20 matching lines @@
 class WorkspaceController;
 FORWARD_DECLARE_TEST(AshPopupAlignmentDelegateTest, AutoHide);
 FORWARD_DECLARE_TEST(WebNotificationTrayTest, PopupAndFullscreen);
 
 // ShelfLayoutManager is the layout manager responsible for the shelf and
 // status widgets. The shelf is given the total available width and told the
 // width of the status area. This allows the shelf to draw the background and
 // layout to the status area.
 // To respond to bounds changes in the status area StatusAreaLayoutManager works
 // closely with ShelfLayoutManager.
+// On mus, widget bounds management is handled by the window manager.
 class ASH_EXPORT ShelfLayoutManager
     : public ash::ShellObserver,
       public aura::client::ActivationChangeObserver,
       public DockedWindowLayoutManagerObserver,
       public keyboard::KeyboardControllerObserver,
       public LockStateObserver,
       public SnapToPixelLayoutManager,
       public SessionStateObserver {
  public:
   // We reserve a small area on the edge of the workspace area to ensure that
@@ skipping 23 matching lines @@
   // Clears internal data for shutdown process.
   void PrepareForShutdown();
 
   // Returns whether the shelf and its contents (shelf, status) are visible
   // on the screen.
   bool IsVisible() const;
 
   // Returns the ideal bounds of the shelf assuming it is visible.
   gfx::Rect GetIdealBounds();
 
+  // Returns the preferred size of the shelf for the target visibility state.
+  gfx::Size GetPreferredSize();
+
   // Returns the docked area bounds.
   const gfx::Rect& dock_bounds() const { return dock_bounds_; }
 
   // Returns the bounds within the root window not occupied by the shelf nor the
   // virtual keyboard.
   const gfx::Rect& user_work_area_bounds() const {
     return user_work_area_bounds_;
   }
 
   // Stops any animations and sets the bounds of the shelf and status widgets.
   void LayoutShelf();
 
   // Returns shelf visibility state based on current value of auto hide
   // behavior setting.
   ShelfVisibilityState CalculateShelfVisibility();
 
   // Updates the visibility state.
   void UpdateVisibilityState();
 
   // Invoked by the shelf when the auto-hide state may have changed.
   void UpdateAutoHideState();
 
+  // Updates the auto-hide state for certain events. In classic ash these come
+  // from an EventHandler. In mash these come from events that hit the shelf

[msw, 2016/05/24 20:46:55]

Could we always forward shelf/status events and remove the EventHandler?
(ShelfLayoutManager could track in_mouse_drag_ itself, right?)

[James Cook, 2016/05/25 00:25:43]

I'd like to do that, but I don't think I can do it yet. I had it that way
initially, but I think in_mouse_drag_ is set for drags that start/end off the
shelf (from app list?). I'm afraid I'm going to break some behavior when I
change it. I can investigate further in a later CL, and I've got a TODO at
AutoHideEventFilter for that.

+  // widget and status tray widget.
+  void UpdateAutoHideForMouseEvent(ui::MouseEvent* event);
+  void UpdateAutoHideForGestureEvent(ui::GestureEvent* event);
+
   ShelfVisibilityState visibility_state() const {
     return state_.visibility_state;
   }
   ShelfAutoHideState auto_hide_state() const { return state_.auto_hide_state; }
 
   ShelfWidget* shelf_widget() { return shelf_; }
 
   // Sets whether any windows overlap the shelf. If a window overlaps the shelf
   // the shelf renders slightly differently.
   void SetWindowOverlapsShelf(bool value);
@@ skipping 211 matching lines @@
   // Do any windows overlap the shelf? This is maintained by WorkspaceManager.
   bool window_overlaps_shelf_;
 
   base::OneShotTimer auto_hide_timer_;
 
   // Whether the mouse was over the shelf when the auto hide timer started.
   // False when neither the auto hide timer nor the timer task are running.
   bool mouse_over_shelf_when_auto_hide_timer_started_;
 
   // EventFilter used to detect when user moves the mouse over the shelf to
-  // trigger showing the shelf.
+  // trigger showing the shelf. Used in classic ash.
   std::unique_ptr<AutoHideEventFilter> auto_hide_event_filter_;
 
   // EventFilter used to detect when user issues a gesture on a bezel sensor.
   std::unique_ptr<ShelfBezelEventFilter> bezel_event_filter_;
 
   base::ObserverList<ShelfLayoutManagerObserver> observers_;
 
+  ShelfGestureHandler gesture_handler_;
+
   // The shelf reacts to gesture-drags, and can be set to auto-hide for certain
   // gestures. Some shelf behaviour (e.g. visibility state, background color
   // etc.) are affected by various stages of the drag. The enum keeps track of
   // the present status of the gesture drag.
   enum GestureDragStatus {
     GESTURE_DRAG_NONE,
     GESTURE_DRAG_IN_PROGRESS,
     GESTURE_DRAG_CANCEL_IN_PROGRESS,
     GESTURE_DRAG_COMPLETE_IN_PROGRESS
   };
@@ skipping 28 matching lines @@
 
   std::unique_ptr<RootWindowControllerObserverImpl>
       root_window_controller_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_