| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/system_gesture_event_filter.h" | 5 #include "ash/wm/system_gesture_event_filter.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/metrics/user_metrics_recorder.h" | 8 #include "ash/metrics/user_metrics_recorder.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/touch/touch_uma.h" | 10 #include "ash/touch/touch_uma.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 long_press_affordance_->ProcessEvent(target, event); | 58 long_press_affordance_->ProcessEvent(target, event); |
| 59 | 59 |
| 60 if (overview_gesture_handler_ && | 60 if (overview_gesture_handler_ && |
| 61 overview_gesture_handler_->ProcessGestureEvent(*event)) { | 61 overview_gesture_handler_->ProcessGestureEvent(*event)) { |
| 62 event->StopPropagation(); | 62 event->StopPropagation(); |
| 63 return; | 63 return; |
| 64 } | 64 } |
| 65 | 65 |
| 66 if (event->type() == ui::ET_GESTURE_WIN8_EDGE_SWIPE && | 66 if (event->type() == ui::ET_GESTURE_WIN8_EDGE_SWIPE && |
| 67 shelf_gesture_handler_->ProcessGestureEvent(*event)) { | 67 shelf_gesture_handler_->ProcessGestureEvent(*event)) { |
| 68 event->StopPropagation(); | 68 // Do not stop propagation, since the immersive fullscreen controller may |
| 69 // need to handle this event. |
| 70 return; |
| 69 } | 71 } |
| 70 } | 72 } |
| 71 | 73 |
| 72 } // namespace internal | 74 } // namespace internal |
| 73 } // namespace ash | 75 } // namespace ash |
| OLD | NEW |