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

Side by Side Diff: ash/shelf/shelf_view.h

Issue 2820693004: shelf: Allow dragging items from main shelf to overflow shelf. (Closed)
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/shelf/shelf_view.cc » ('j') | ash/shelf/shelf_view.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_SHELF_SHELF_VIEW_H_ 5 #ifndef ASH_SHELF_SHELF_VIEW_H_
6 #define ASH_SHELF_SHELF_VIEW_H_ 6 #define ASH_SHELF_SHELF_VIEW_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
448 448
449 // The rip off view when a snap back operation is underway. 449 // The rip off view when a snap back operation is underway.
450 views::View* snap_back_from_rip_off_view_; 450 views::View* snap_back_from_rip_off_view_;
451 451
452 // True when this ShelfView is used for Overflow Bubble. 452 // True when this ShelfView is used for Overflow Bubble.
453 bool overflow_mode_; 453 bool overflow_mode_;
454 454
455 // Holds a pointer to main ShelfView when a ShelfView is in overflow mode. 455 // Holds a pointer to main ShelfView when a ShelfView is in overflow mode.
456 ShelfView* main_shelf_; 456 ShelfView* main_shelf_;
457 457
458 // True when ripped item from overflow bubble is entered into Shelf. 458 // True when ripped item from overflow bubble is entered into Shelf or vice
msw 2017/04/17 19:29:09 nit: // True when an item is dragged from one shel
sammiequon 2017/04/17 23:42:29 Done.
459 bool dragged_off_from_overflow_to_shelf_; 459 // versa.
460 bool dragged_off_from_shelf_to_other_shelf_;
msw 2017/04/17 19:29:09 This name is pretty bad; how about moving this jus
sammiequon 2017/04/17 23:42:29 Done.
460 461
461 // True if the event is a repost event from a event which has just closed the 462 // True if the event is a repost event from a event which has just closed the
462 // menu of the same shelf item. 463 // menu of the same shelf item.
463 bool is_repost_event_on_same_item_; 464 bool is_repost_event_on_same_item_;
464 465
465 // Record the index for the last pressed shelf item. This variable is used to 466 // Record the index for the last pressed shelf item. This variable is used to
466 // check if a repost event occurs on the same shelf item as previous one. If 467 // check if a repost event occurs on the same shelf item as previous one. If
467 // so, the repost event should be ignored. 468 // so, the repost event should be ignored.
468 int last_pressed_index_; 469 int last_pressed_index_;
469 470
470 // Tracks UMA metrics based on shelf button press actions. 471 // Tracks UMA metrics based on shelf button press actions.
471 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 472 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
472 473
473 base::WeakPtrFactory<ShelfView> weak_factory_; 474 base::WeakPtrFactory<ShelfView> weak_factory_;
474 475
475 DISALLOW_COPY_AND_ASSIGN(ShelfView); 476 DISALLOW_COPY_AND_ASSIGN(ShelfView);
476 }; 477 };
477 478
478 } // namespace ash 479 } // namespace ash
479 480
480 #endif // ASH_SHELF_SHELF_VIEW_H_ 481 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« 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