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

Unified Diff: ash/shelf/shelf_layout_manager.h

Issue 879653002: Remove --ash-enable-tray-dragging flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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/ash_switches.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_layout_manager.h
diff --git a/ash/shelf/shelf_layout_manager.h b/ash/shelf/shelf_layout_manager.h
index e42df4dd547ab131c0696f0b59bc08bac30dada1..7e0118a79f0dd43414e7692d28abd18edfe2ec74 100644
--- a/ash/shelf/shelf_layout_manager.h
+++ b/ash/shelf/shelf_layout_manager.h
@@ -153,14 +153,7 @@ class ASH_EXPORT ShelfLayoutManager
// Gesture related functions:
void OnGestureEdgeSwipe(const ui::GestureEvent& gesture);
void StartGestureDrag(const ui::GestureEvent& gesture);
- enum DragState {
- DRAG_SHELF,
- DRAG_TRAY
- };
- // Returns DRAG_SHELF if the gesture should continue to drag the entire shelf.
- // Returns DRAG_TRAY if the gesture can start dragging the tray-bubble from
- // this point on.
- DragState UpdateGestureDrag(const ui::GestureEvent& gesture);
+ void UpdateGestureDrag(const ui::GestureEvent& gesture);
void CompleteGestureDrag(const ui::GestureEvent& gesture);
void CancelGestureDrag();
« no previous file with comments | « ash/ash_switches.cc ('k') | ash/shelf/shelf_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698