| Index: ash/aura/wm_shelf_aura.h
|
| diff --git a/ash/aura/wm_shelf_aura.h b/ash/aura/wm_shelf_aura.h
|
| index 8fc0f3c029923aa9092e54afd54fc50446ac588a..d162b8b756cc672c76a86cabee93bc6412b01bd8 100644
|
| --- a/ash/aura/wm_shelf_aura.h
|
| +++ b/ash/aura/wm_shelf_aura.h
|
| @@ -9,7 +9,6 @@
|
| #include "ash/common/shelf/wm_shelf.h"
|
| #include "ash/shelf/shelf_icon_observer.h"
|
| #include "ash/shelf/shelf_layout_manager_observer.h"
|
| -#include "ash/wm/gestures/shelf_gesture_handler.h"
|
| #include "base/macros.h"
|
| #include "base/observer_list.h"
|
|
|
| @@ -57,8 +56,7 @@ class ASH_EXPORT WmShelfAura : public WmShelf,
|
| gfx::Rect GetUserWorkAreaBounds() const override;
|
| void UpdateIconPositionForWindow(WmWindow* window) override;
|
| gfx::Rect GetScreenBoundsOfItemIconForWindow(WmWindow* window) override;
|
| - bool ProcessGestureEvent(const ui::GestureEvent& event,
|
| - WmWindow* target_window) override;
|
| + bool ProcessGestureEvent(const ui::GestureEvent& event) override;
|
| void UpdateAutoHideForMouseEvent(ui::MouseEvent* event) override;
|
| void UpdateAutoHideForGestureEvent(ui::GestureEvent* event) override;
|
| void AddObserver(WmShelfObserver* observer) override;
|
| @@ -83,9 +81,6 @@ class ASH_EXPORT WmShelfAura : public WmShelf,
|
| // Cached separately because it may be destroyed before |shelf_|.
|
| ShelfLayoutManager* shelf_layout_manager_ = nullptr;
|
|
|
| - // Handler for swipe and drag gestures.
|
| - ShelfGestureHandler gesture_handler_;
|
| -
|
| base::ObserverList<WmShelfObserver> observers_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WmShelfAura);
|
|
|