Chromium Code Reviews| 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 68 public views::BoundsAnimatorObserver, | 68 public views::BoundsAnimatorObserver, |
| 69 public app_list::ApplicationDragAndDropHost { | 69 public app_list::ApplicationDragAndDropHost { |
| 70 public: | 70 public: |
| 71 ShelfView(ShelfModel* model, | 71 ShelfView(ShelfModel* model, |
| 72 ShelfDelegate* delegate, | 72 ShelfDelegate* delegate, |
| 73 WmShelf* wm_shelf, | 73 WmShelf* wm_shelf, |
| 74 Shelf* shelf); | 74 Shelf* shelf); |
| 75 ~ShelfView() override; | 75 ~ShelfView() override; |
| 76 | 76 |
| 77 Shelf* shelf() const { return shelf_; } | 77 Shelf* shelf() const { return shelf_; } |
| 78 WmShelf* wm_shelf() const { return wm_shelf_; } | |
|
James Cook
2016/07/22 23:48:21
optional: This is OK, but what do you think of pas
msw
2016/07/25 22:56:44
The WmShelf is injected into ShelfView via ctor, s
| |
| 78 ShelfModel* model() const { return model_; } | 79 ShelfModel* model() const { return model_; } |
| 79 | 80 |
| 80 void Init(); | 81 void Init(); |
| 81 | 82 |
| 82 void OnShelfAlignmentChanged(); | 83 void OnShelfAlignmentChanged(); |
| 83 void SchedulePaintForAllButtons(); | 84 void SchedulePaintForAllButtons(); |
| 84 | 85 |
| 85 // Returns the ideal bounds of the specified item, or an empty rect if id | 86 // Returns the ideal bounds of the specified item, or an empty rect if id |
| 86 // isn't know. If the item is in an overflow shelf, the overflow icon location | 87 // isn't know. If the item is in an overflow shelf, the overflow icon location |
| 87 // will be returned. | 88 // will be returned. |
| (...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 466 | 467 |
| 467 // Tracks UMA metrics based on shelf button press actions. | 468 // Tracks UMA metrics based on shelf button press actions. |
| 468 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; | 469 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; |
| 469 | 470 |
| 470 DISALLOW_COPY_AND_ASSIGN(ShelfView); | 471 DISALLOW_COPY_AND_ASSIGN(ShelfView); |
| 471 }; | 472 }; |
| 472 | 473 |
| 473 } // namespace ash | 474 } // namespace ash |
| 474 | 475 |
| 475 #endif // ASH_SHELF_SHELF_VIEW_H_ | 476 #endif // ASH_SHELF_SHELF_VIEW_H_ |
| OLD | NEW |