| OLD | NEW |
| 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 <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 338 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 349 OverflowBubble* owner_overflow_bubble_; | 349 OverflowBubble* owner_overflow_bubble_; |
| 350 | 350 |
| 351 scoped_ptr<ShelfTooltipManager> tooltip_; | 351 scoped_ptr<ShelfTooltipManager> tooltip_; |
| 352 | 352 |
| 353 // Pointer device that initiated the current drag operation. If there is no | 353 // Pointer device that initiated the current drag operation. If there is no |
| 354 // current dragging operation, this is NONE. | 354 // current dragging operation, this is NONE. |
| 355 Pointer drag_pointer_; | 355 Pointer drag_pointer_; |
| 356 | 356 |
| 357 // The view being dragged. This is set immediately when the mouse is pressed. | 357 // The view being dragged. This is set immediately when the mouse is pressed. |
| 358 // |dragging_| is set only if the mouse is dragged far enough. | 358 // |dragging_| is set only if the mouse is dragged far enough. |
| 359 views::View* drag_view_; | 359 ShelfButton* drag_view_; |
| 360 | 360 |
| 361 // Position of the mouse down event in |drag_view_|'s coordinates. | 361 // Position of the mouse down event in |drag_view_|'s coordinates. |
| 362 gfx::Point drag_origin_; | 362 gfx::Point drag_origin_; |
| 363 | 363 |
| 364 // Index |drag_view_| was initially at. | 364 // Index |drag_view_| was initially at. |
| 365 int start_drag_index_; | 365 int start_drag_index_; |
| 366 | 366 |
| 367 // Used for the context menu of a particular item. | 367 // Used for the context menu of a particular item. |
| 368 ShelfID context_menu_id_; | 368 ShelfID context_menu_id_; |
| 369 | 369 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 | 439 |
| 440 // True when ripped item from overflow bubble is entered into Shelf. | 440 // True when ripped item from overflow bubble is entered into Shelf. |
| 441 bool dragged_off_from_overflow_to_shelf_; | 441 bool dragged_off_from_overflow_to_shelf_; |
| 442 | 442 |
| 443 DISALLOW_COPY_AND_ASSIGN(ShelfView); | 443 DISALLOW_COPY_AND_ASSIGN(ShelfView); |
| 444 }; | 444 }; |
| 445 | 445 |
| 446 } // namespace ash | 446 } // namespace ash |
| 447 | 447 |
| 448 #endif // ASH_SHELF_SHELF_VIEW_H_ | 448 #endif // ASH_SHELF_SHELF_VIEW_H_ |
| OLD | NEW |