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

Unified Diff: ash/shelf/shelf_layout_manager.h

Issue 2237613002: mash: Migrate some misc ShelfLayoutManager deps to ash common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments. 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/shelf/shelf_bezel_event_handler.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 9e180adfb821763049466e2c1918d0cf7989ba2e..934a08db2652e2c2ad4d44f5435e3a1fea33a0d0 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -32,7 +32,6 @@ class ImplicitAnimationObserver;
namespace ash {
class PanelLayoutManagerTest;
-class ShelfBezelEventFilter;
class ShelfLayoutManagerObserver;
class ShelfLayoutManagerTest;
class ShelfWidget;
@@ -134,7 +133,6 @@ class ASH_EXPORT ShelfLayoutManager
// Overridden from ShellObserver:
void OnLockStateChanged(bool locked) override;
- void OnShelfAlignmentChanged(WmWindow* root_window) override;
void OnShelfAutoHideBehaviorChanged(WmWindow* root_window) override;
void OnPinnedStateChanged(WmWindow* pinned_window) override;
@@ -324,9 +322,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 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
« no previous file with comments | « ash/shelf/shelf_bezel_event_handler.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698