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

Unified Diff: ash/aura/wm_shelf_aura.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/aura/wm_shelf_aura.h ('k') | ash/common/shelf/wm_shelf.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shelf_aura.cc
diff --git a/ash/aura/wm_shelf_aura.cc b/ash/aura/wm_shelf_aura.cc
index 5d70a393b9f88343a9cc47b74bf7a9cd094c764f..84c7892d57112798116ca0b4ba6864a4c6a79877 100644
--- a/ash/aura/wm_shelf_aura.cc
+++ b/ash/aura/wm_shelf_aura.cc
@@ -133,10 +133,11 @@ gfx::Rect WmShelfAura::GetScreenBoundsOfItemIconForWindow(WmWindow* window) {
WmWindowAura::GetAuraWindow(window));
}
-bool WmShelfAura::ProcessGestureEvent(const ui::GestureEvent& event,
- WmWindow* target_window) {
- return gesture_handler_.ProcessGestureEvent(
- event, WmWindowAura::GetAuraWindow(target_window));
+bool WmShelfAura::ProcessGestureEvent(const ui::GestureEvent& event) {
+ // Can be called at login screen.
+ if (!shelf_layout_manager_)
+ return false;
+ return shelf_layout_manager_->ProcessGestureEvent(event);
}
void WmShelfAura::UpdateAutoHideForMouseEvent(ui::MouseEvent* event) {
« no previous file with comments | « ash/aura/wm_shelf_aura.h ('k') | ash/common/shelf/wm_shelf.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698