| Index: ash/common/system/tray/tray_event_filter.h
|
| diff --git a/ash/common/system/tray/tray_event_filter.h b/ash/common/system/tray/tray_event_filter.h
|
| index 88a5ba8085c61a5daf12914a73c113d5e43c8d24..b7e2aafeaf397c7844f96966f0bf68ded429d5e5 100644
|
| --- a/ash/common/system/tray/tray_event_filter.h
|
| +++ b/ash/common/system/tray/tray_event_filter.h
|
| @@ -15,7 +15,7 @@ class Point;
|
| }
|
|
|
| namespace ui {
|
| -class LocatedEvent;
|
| +class PointerEvent;
|
| }
|
|
|
| namespace ash {
|
| @@ -32,12 +32,9 @@ class TrayEventFilter : public views::PointerWatcher {
|
| void RemoveWrapper(TrayBubbleWrapper* wrapper);
|
|
|
| // views::PointerWatcher:
|
| - void OnMousePressed(const ui::MouseEvent& event,
|
| - const gfx::Point& location_in_screen,
|
| - views::Widget* target) override;
|
| - void OnTouchPressed(const ui::TouchEvent& event,
|
| - const gfx::Point& location_in_screen,
|
| - views::Widget* target) override;
|
| + void OnPointerWatcherEvent(const ui::PointerEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) override;
|
|
|
| private:
|
| void ProcessPressedEvent(const gfx::Point& location_in_screen,
|
|
|