mash: Move AutoHideEventHandler to WmShelfAura.

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 "ash/ash_export.h"
@@ skipping 80 matching lines @@
   // 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
-  // widget and status tray widget.
-  void UpdateAutoHideForMouseEvent(ui::MouseEvent* event);
-  void UpdateAutoHideForGestureEvent(ui::GestureEvent* event);
+  // Updates the auto-hide state for certain events.
+  // TODO(mash): Add similar event handling support for mash.
+  void UpdateAutoHideForMouseEvent(ui::MouseEvent* event, WmWindow* target);
+  void UpdateAutoHideForGestureEvent(ui::GestureEvent* event, WmWindow* target);
 
   ShelfVisibilityState visibility_state() const {
     return state_.visibility_state;
   }
   ShelfAutoHideState auto_hide_state() const { return state_.auto_hide_state; }
 
   ShelfWidget* shelf_widget() { return shelf_widget_; }
 
   // Sets whether any windows overlap the shelf. If a window overlaps the shelf
   // the shelf renders slightly differently.
@@ skipping 65 matching lines @@
   bool IsHorizontalAlignment() const;
 
   // Returns how the shelf background is painted.
   ShelfBackgroundType GetShelfBackgroundType() const;
 
   // Set the height of the ChromeVox panel, which takes away space from the
   // available work area from the top of the screen.
   void SetChromeVoxPanelHeight(int height);
 
  private:
-  class AutoHideEventFilter;
   class RootWindowControllerObserverImpl;
   class UpdateShelfObserver;
   friend class PanelLayoutManagerTest;
   friend class ShelfLayoutManagerTest;
 
   struct TargetBounds {
     TargetBounds();
     ~TargetBounds();
 
     float opacity;
@@ skipping 67 matching lines @@
   // when the shelf is auto hidden and the shelf is on the boundary between
   // two displays.
   gfx::Rect GetAutoHideShowShelfRegionInScreen() const;
 
   // Returns the AutoHideState. This value is determined from the shelf and
   // tray.
   ShelfAutoHideState CalculateAutoHideState(
       ShelfVisibilityState visibility_state) const;
 
   // Returns true if |window| is a descendant of the shelf.
-  bool IsShelfWindow(aura::Window* window);
+  bool IsShelfWindow(WmWindow* window);
 
   int GetWorkAreaInsets(const State& state, int size) const;
 
   // Overridden from DockedWindowLayoutManagerObserver:
   void OnDockBoundsChanging(
       const gfx::Rect& dock_bounds,
       DockedWindowLayoutManagerObserver::Reason reason) override;
 
   // Called when the LoginUI changes from visible to invisible.
   void UpdateShelfVisibilityAfterLoginUIChange();
@@ skipping 10 matching lines @@
   void UpdateGestureDrag(const ui::GestureEvent& gesture);
   void CompleteGestureDrag(const ui::GestureEvent& gesture);
   void CancelGestureDrag();
 
   // True when inside UpdateBoundsAndOpacity() method. Used to prevent calling
   // UpdateBoundsAndOpacity() again from SetChildBounds().
   bool updating_bounds_;
 
   bool in_shutdown_ = false;
 
+  // True if the last mouse event was a mouse drag.
+  bool in_mouse_drag_ = false;
+
   // Current state.
   State state_;
 
   ShelfWidget* shelf_widget_;
 
   WorkspaceController* workspace_controller_;
 
   // 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. 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_;
 
   // 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 {
@@ skipping 33 matching lines @@
 
   std::unique_ptr<RootWindowControllerObserverImpl>
       root_window_controller_observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ShelfLayoutManager);
 };
 
 }  // namespace ash
 
 #endif  // ASH_SHELF_SHELF_LAYOUT_MANAGER_H_