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

Unified Diff: ash/shelf/shelf_view.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/shelf/shelf_view.h ('k') | ash/wm/gestures/shelf_gesture_handler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.cc
diff --git a/ash/shelf/shelf_view.cc b/ash/shelf/shelf_view.cc
index c465a904f0427d76787b8f42eff88b0e1f04c5f2..44cd83d6d66f76e5f1e028f9803e844a215506fc 100644
--- a/ash/shelf/shelf_view.cc
+++ b/ash/shelf/shelf_view.cc
@@ -1543,10 +1543,7 @@ void ShelfView::ViewHierarchyChanged(
}
void ShelfView::OnGestureEvent(ui::GestureEvent* event) {
- aura::Window* target_window = static_cast<views::View*>(event->target())
- ->GetWidget()
- ->GetNativeWindow();
- if (gesture_handler_.ProcessGestureEvent(*event, target_window))
+ if (wm_shelf_->ProcessGestureEvent(*event))
event->StopPropagation();
}
« no previous file with comments | « ash/shelf/shelf_view.h ('k') | ash/wm/gestures/shelf_gesture_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698