| 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 <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 const ViewHierarchyChangedDetails& details) override; | 287 const ViewHierarchyChangedDetails& details) override; |
| 288 | 288 |
| 289 // Overridden from ui::EventHandler: | 289 // Overridden from ui::EventHandler: |
| 290 void OnGestureEvent(ui::GestureEvent* event) override; | 290 void OnGestureEvent(ui::GestureEvent* event) override; |
| 291 | 291 |
| 292 // Overridden from ShelfModelObserver: | 292 // Overridden from ShelfModelObserver: |
| 293 void ShelfItemAdded(int model_index) override; | 293 void ShelfItemAdded(int model_index) override; |
| 294 void ShelfItemRemoved(int model_index, const ShelfItem& old_item) override; | 294 void ShelfItemRemoved(int model_index, const ShelfItem& old_item) override; |
| 295 void ShelfItemChanged(int model_index, const ShelfItem& old_item) override; | 295 void ShelfItemChanged(int model_index, const ShelfItem& old_item) override; |
| 296 void ShelfItemMoved(int start_index, int target_index) override; | 296 void ShelfItemMoved(int start_index, int target_index) override; |
| 297 void ShelfItemDelegateChanged(const ShelfID& id, |
| 298 ShelfItemDelegate* delegate) override; |
| 297 | 299 |
| 298 // Handles the result of an item selection, records the |action| taken and | 300 // Handles the result of an item selection, records the |action| taken and |
| 299 // optionally shows an application menu with the given |menu_items|. | 301 // optionally shows an application menu with the given |menu_items|. |
| 300 void AfterItemSelected( | 302 void AfterItemSelected( |
| 301 const ShelfItem& item, | 303 const ShelfItem& item, |
| 302 views::Button* sender, | 304 views::Button* sender, |
| 303 std::unique_ptr<ui::Event> event, | 305 std::unique_ptr<ui::Event> event, |
| 304 views::InkDrop* ink_drop, | 306 views::InkDrop* ink_drop, |
| 305 ShelfAction action, | 307 ShelfAction action, |
| 306 base::Optional<std::vector<mojom::MenuItemPtr>> menu_items); | 308 base::Optional<std::vector<mojom::MenuItemPtr>> menu_items); |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 473 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; | 475 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; |
| 474 | 476 |
| 475 base::WeakPtrFactory<ShelfView> weak_factory_; | 477 base::WeakPtrFactory<ShelfView> weak_factory_; |
| 476 | 478 |
| 477 DISALLOW_COPY_AND_ASSIGN(ShelfView); | 479 DISALLOW_COPY_AND_ASSIGN(ShelfView); |
| 478 }; | 480 }; |
| 479 | 481 |
| 480 } // namespace ash | 482 } // namespace ash |
| 481 | 483 |
| 482 #endif // ASH_SHELF_SHELF_VIEW_H_ | 484 #endif // ASH_SHELF_SHELF_VIEW_H_ |
| OLD | NEW |