| Index: ash/shelf/shelf_layout_manager.h
|
| diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
|
| index e2018f8eaa181fd9f452a39f03aa242b07b1bb37..2fa55624b4394e685a0a7b2a301bbfb408c52f5e 100644
|
| --- a/ash/shelf/shelf_layout_manager.h
|
| +++ b/ash/shelf/shelf_layout_manager.h
|
| @@ -5,6 +5,8 @@
|
| #ifndef ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
|
| #define ASH_SHELF_SHELF_LAYOUT_MANAGER_H_
|
|
|
| +#include <vector>
|
| +
|
| #include "ash/ash_export.h"
|
| #include "ash/launcher/launcher.h"
|
| #include "ash/shelf/background_animator.h"
|
| @@ -194,6 +196,7 @@ class ASH_EXPORT ShelfLayoutManager :
|
|
|
| private:
|
| class AutoHideEventFilter;
|
| + class BezelEventFilter;
|
| class UpdateShelfObserver;
|
| friend class ash::ScreenAsh;
|
| friend class PanelLayoutManagerTest;
|
| @@ -312,7 +315,10 @@ class ASH_EXPORT ShelfLayoutManager :
|
|
|
| // EventFilter used to detect when user moves the mouse over the launcher to
|
| // trigger showing the launcher.
|
| - scoped_ptr<AutoHideEventFilter> event_filter_;
|
| + scoped_ptr<AutoHideEventFilter> auto_hide_event_filter_;
|
| +
|
| + // EventFilter used to detect when user issues a gesture on a bezel sensor.
|
| + scoped_ptr<BezelEventFilter> bezel_event_filter_;
|
|
|
| ObserverList<ShelfLayoutManagerObserver> observers_;
|
|
|
|
|