| Index: ash/shelf/shelf_bezel_event_filter.h
|
| diff --git a/ash/shelf/shelf_bezel_event_filter.h b/ash/shelf/shelf_bezel_event_filter.h
|
| index f2edffbeb997a5702e3c7ba83ff8b9fc3ffa4af2..ff7d14d034512bf54b17b35569edaff4c529507f 100644
|
| --- a/ash/shelf/shelf_bezel_event_filter.h
|
| +++ b/ash/shelf/shelf_bezel_event_filter.h
|
| @@ -5,10 +5,13 @@
|
| #ifndef ASH_SHELF_SHELF_BEZEL_EVENT_FILTER_H_
|
| #define ASH_SHELF_SHELF_BEZEL_EVENT_FILTER_H_
|
|
|
| -#include "ash/wm/gestures/shelf_gesture_handler.h"
|
| #include "base/macros.h"
|
| #include "ui/events/event_handler.h"
|
| -#include "ui/gfx/geometry/rect.h"
|
| +
|
| +namespace gfx {
|
| +class Point;
|
| +class Rect;
|
| +}
|
|
|
| namespace ash {
|
| class ShelfLayoutManager;
|
| @@ -17,7 +20,7 @@ class ShelfLayoutManager;
|
| // shelf.
|
| class ShelfBezelEventFilter : public ui::EventHandler {
|
| public:
|
| - explicit ShelfBezelEventFilter(ShelfLayoutManager* shelf);
|
| + explicit ShelfBezelEventFilter(ShelfLayoutManager* shelf_layout_manager);
|
| ~ShelfBezelEventFilter() override;
|
|
|
| // Overridden from ui::EventHandler:
|
| @@ -26,9 +29,9 @@ class ShelfBezelEventFilter : public ui::EventHandler {
|
| private:
|
| bool IsShelfOnBezel(const gfx::Rect& screen, const gfx::Point& point) const;
|
|
|
| - ShelfLayoutManager* shelf_; // non-owned
|
| + ShelfLayoutManager* shelf_layout_manager_;
|
| bool in_touch_drag_;
|
| - ShelfGestureHandler gesture_handler_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ShelfBezelEventFilter);
|
| };
|
|
|
|
|