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

Unified Diff: ash/wm/system_gesture_event_filter.cc

Issue 2224653002: mash: Remove ash::ShelfGestureHandler and ui::ET_GESTURE_WIN8_EDGE_SWIPE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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') | ui/events/event.h » ('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 4cd988464696c917bdba508db91feaf9765c29b0..43132f6f6723ad8fe2935a8d69f27ca692a6dddd 100644
--- a/ash/wm/system_gesture_event_filter.cc
+++ b/ash/wm/system_gesture_event_filter.cc
@@ -9,7 +9,6 @@
#include "ash/shell.h"
#include "ash/touch/touch_uma.h"
#include "ash/wm/gestures/overview_gesture_handler.h"
-#include "ash/wm/gestures/shelf_gesture_handler.h"
#include "ui/base/touch/touch_device.h"
#include "ui/events/event.h"
#include "ui/events/event_constants.h"
@@ -17,8 +16,7 @@
namespace ash {
SystemGestureEventFilter::SystemGestureEventFilter()
- : overview_gesture_handler_(new OverviewGestureHandler),
- shelf_gesture_handler_(new ShelfGestureHandler()) {}
+ : overview_gesture_handler_(new OverviewGestureHandler) {}
SystemGestureEventFilter::~SystemGestureEventFilter() {}
@@ -47,13 +45,6 @@ void SystemGestureEventFilter::OnTouchEvent(ui::TouchEvent* event) {
void SystemGestureEventFilter::OnGestureEvent(ui::GestureEvent* event) {
aura::Window* target = static_cast<aura::Window*>(event->target());
ash::TouchUMA::GetInstance()->RecordGestureEvent(target, *event);
-
- if (event->type() == ui::ET_GESTURE_WIN8_EDGE_SWIPE &&
- shelf_gesture_handler_->ProcessGestureEvent(*event, target)) {
- // Do not stop propagation, since the immersive fullscreen controller may
- // need to handle this event.
- return;
- }
}
} // namespace ash
« no previous file with comments | « ash/wm/system_gesture_event_filter.h ('k') | ui/events/event.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698