Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2267)

Unified Diff: ash/shelf/shelf_layout_manager.h

Issue 2227143003: mash: Move AutoHideEventHandler to WmShelfAura. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index dfde44a197315e31da3a30f617a6a808050f26ba..9e180adfb821763049466e2c1918d0cf7989ba2e 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -98,11 +98,10 @@ class ASH_EXPORT ShelfLayoutManager
// 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;
@@ -188,7 +187,6 @@ class ASH_EXPORT ShelfLayoutManager
void SetChromeVoxPanelHeight(int height);
private:
- class AutoHideEventFilter;
class RootWindowControllerObserverImpl;
class UpdateShelfObserver;
friend class PanelLayoutManagerTest;
@@ -276,7 +274,7 @@ class ASH_EXPORT ShelfLayoutManager
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;
@@ -307,6 +305,9 @@ class ASH_EXPORT ShelfLayoutManager
bool in_shutdown_ = false;
+ // True if the last mouse event was a mouse drag.
+ bool in_mouse_drag_ = false;
+
// Current state.
State state_;
@@ -323,10 +324,6 @@ class ASH_EXPORT ShelfLayoutManager
// 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_;
« no previous file with comments | « ash/mus/bridge/wm_shelf_mus.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698