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

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

Issue 2870683002: ash: Remove ShelfModel id conversion functions. (Closed)
Patch Set: Address comments. Created 3 years, 7 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 | « ash/shelf/shelf_model_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »
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 413 matching lines...) Expand 10 before | Expand all | Expand 10 after
424 // The timestamp of the last shelf item touch press event. 424 // The timestamp of the last shelf item touch press event.
425 base::TimeTicks touch_press_time_; 425 base::TimeTicks touch_press_time_;
426 426
427 // True if a drag and drop operation created/pinned the item in the launcher 427 // True if a drag and drop operation created/pinned the item in the launcher
428 // and it needs to be deleted/unpinned again if the operation gets cancelled. 428 // and it needs to be deleted/unpinned again if the operation gets cancelled.
429 bool drag_and_drop_item_pinned_ = false; 429 bool drag_and_drop_item_pinned_ = false;
430 430
431 // The ShelfItem currently used for drag and drop; empty if none. 431 // The ShelfItem currently used for drag and drop; empty if none.
432 ShelfID drag_and_drop_shelf_id_; 432 ShelfID drag_and_drop_shelf_id_;
433 433
434 // The application ID of the application which we drag and drop.
435 std::string drag_and_drop_app_id_;
436
437 // The original launcher item's size before the dragging operation. 434 // The original launcher item's size before the dragging operation.
438 gfx::Size pre_drag_and_drop_size_; 435 gfx::Size pre_drag_and_drop_size_;
439 436
440 // The image proxy for drag operations when a drag and drop host exists and 437 // The image proxy for drag operations when a drag and drop host exists and
441 // the item can be dragged outside the app grid. 438 // the item can be dragged outside the app grid.
442 std::unique_ptr<ash::DragImageView> drag_image_; 439 std::unique_ptr<ash::DragImageView> drag_image_;
443 440
444 // The cursor offset to the middle of the dragged item. 441 // The cursor offset to the middle of the dragged item.
445 gfx::Vector2d drag_image_offset_; 442 gfx::Vector2d drag_image_offset_;
446 443
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; 475 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_;
479 476
480 base::WeakPtrFactory<ShelfView> weak_factory_; 477 base::WeakPtrFactory<ShelfView> weak_factory_;
481 478
482 DISALLOW_COPY_AND_ASSIGN(ShelfView); 479 DISALLOW_COPY_AND_ASSIGN(ShelfView);
483 }; 480 };
484 481
485 } // namespace ash 482 } // namespace ash
486 483
487 #endif // ASH_SHELF_SHELF_VIEW_H_ 484 #endif // ASH_SHELF_SHELF_VIEW_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_model_unittest.cc ('k') | ash/shelf/shelf_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698