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

Unified Diff: ash/shelf/shelf_view.h

Issue 2820693004: shelf: Allow dragging items from main shelf to overflow shelf. (Closed)
Patch Set: Fixed patch set 1 errors. Created 3 years, 8 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 | « no previous file | ash/shelf/shelf_view.cc » ('j') | ash/shelf/shelf_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shelf/shelf_view.h
diff --git a/ash/shelf/shelf_view.h b/ash/shelf/shelf_view.h
index e0692e103249bd6f30ad974826a738540da64d94..0c6cc3fddd7e22e01f9a6ffaf78dc6bbe3b88ae3 100644
--- a/ash/shelf/shelf_view.h
+++ b/ash/shelf/shelf_view.h
@@ -446,6 +446,9 @@ class ASH_EXPORT ShelfView : public views::View,
// True when the icon was dragged off the shelf.
bool dragged_off_shelf_;
+ // True when an item is dragged from one shelf to another (eg. overflow).
+ bool dragged_to_another_shelf_;
+
// The rip off view when a snap back operation is underway.
views::View* snap_back_from_rip_off_view_;
@@ -455,9 +458,6 @@ class ASH_EXPORT ShelfView : public views::View,
// Holds a pointer to main ShelfView when a ShelfView is in overflow mode.
ShelfView* main_shelf_;
- // True when ripped item from overflow bubble is entered into Shelf.
- bool dragged_off_from_overflow_to_shelf_;
-
// True if the event is a repost event from a event which has just closed the
// menu of the same shelf item.
bool is_repost_event_on_same_item_;
« no previous file with comments | « no previous file | ash/shelf/shelf_view.cc » ('j') | ash/shelf/shelf_view.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698