Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2804)

Unified Diff: ash/wm/system_gesture_event_filter.cc

Issue 15931005: Move bezel event routing for the shelf into ShelfLayoutManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed failing test after discussing with sadrul Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/system_gesture_event_filter.h ('k') | ash/wm/system_gesture_event_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/system_gesture_event_filter.cc
diff --git a/ash/wm/system_gesture_event_filter.cc b/ash/wm/system_gesture_event_filter.cc
index aff065bb561f13d1e75778b146ee52cfe0e88529..029ab720f4e6e1a064ae81b77d43d17b5968a00d 100644
--- a/ash/wm/system_gesture_event_filter.cc
+++ b/ash/wm/system_gesture_event_filter.cc
@@ -11,7 +11,6 @@
#include "ash/shell.h"
#include "ash/shell_delegate.h"
#include "ash/shell_window_ids.h"
-#include "ash/wm/gestures/border_gesture_handler.h"
#include "ash/wm/gestures/long_press_affordance_handler.h"
#include "ash/wm/gestures/system_pinch_handler.h"
#include "ash/wm/gestures/two_finger_drag_handler.h"
@@ -45,7 +44,6 @@ namespace internal {
SystemGestureEventFilter::SystemGestureEventFilter()
: system_gestures_enabled_(CommandLine::ForCurrentProcess()->
HasSwitch(ash::switches::kAshEnableAdvancedGestures)),
- border_gestures_(new BorderGestureHandler),
long_press_affordance_(new LongPressAffordanceHandler),
two_finger_drag_(new TwoFingerDragHandler) {
}
@@ -77,11 +75,6 @@ void SystemGestureEventFilter::OnGestureEvent(ui::GestureEvent* event) {
long_press_affordance_->ProcessEvent(target, event,
event->GetLowestTouchId());
- if (border_gestures_->ProcessGestureEvent(target, *event)) {
- event->StopPropagation();
- return;
- }
-
if (two_finger_drag_->ProcessGestureEvent(target, *event)) {
event->StopPropagation();
return;
« no previous file with comments | « ash/wm/system_gesture_event_filter.h ('k') | ash/wm/system_gesture_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698