| Index: ash/common/system/tray/tray_event_filter.cc
|
| diff --git a/ash/common/system/tray/tray_event_filter.cc b/ash/common/system/tray/tray_event_filter.cc
|
| index 658a91d2ebd460bd39b19571798b1ba2437540eb..9997df1bd1089fda0bc95b4dcb4f0979831797a6 100644
|
| --- a/ash/common/system/tray/tray_event_filter.cc
|
| +++ b/ash/common/system/tray/tray_event_filter.cc
|
| @@ -35,18 +35,32 @@ void TrayEventFilter::RemoveWrapper(TrayBubbleWrapper* wrapper) {
|
| WmShell::Get()->RemovePointerWatcher(this);
|
| }
|
|
|
| -void TrayEventFilter::OnMousePressed(const ui::MouseEvent& event,
|
| - const gfx::Point& location_in_screen,
|
| - views::Widget* target) {
|
| +void TrayEventFilter::OnMousePressObserved(const ui::MouseEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) {
|
| ProcessPressedEvent(location_in_screen, target);
|
| }
|
|
|
| -void TrayEventFilter::OnTouchPressed(const ui::TouchEvent& event,
|
| - const gfx::Point& location_in_screen,
|
| - views::Widget* target) {
|
| +void TrayEventFilter::OnTouchPressObserved(const ui::TouchEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) {
|
| ProcessPressedEvent(location_in_screen, target);
|
| }
|
|
|
| +void TrayEventFilter::OnTouchReleaseObserved(
|
| + const ui::TouchEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) {}
|
| +
|
| +void TrayEventFilter::OnTouchMoveObserved(const ui::TouchEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) {}
|
| +
|
| +void TrayEventFilter::OnTouchCancellObserved(
|
| + const ui::TouchEvent& event,
|
| + const gfx::Point& location_in_screen,
|
| + views::Widget* target) {}
|
| +
|
| void TrayEventFilter::ProcessPressedEvent(const gfx::Point& location_in_screen,
|
| views::Widget* target) {
|
| if (target) {
|
|
|