| 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_COMMON_SHELF_SHELF_VIEW_H_ | 5 #ifndef ASH_COMMON_SHELF_SHELF_VIEW_H_ |
| 6 #define ASH_COMMON_SHELF_SHELF_VIEW_H_ | 6 #define ASH_COMMON_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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 class ShelfDelegate; | 47 class ShelfDelegate; |
| 48 class ShelfModel; | 48 class ShelfModel; |
| 49 struct ShelfItem; | 49 struct ShelfItem; |
| 50 class ShelfWidget; | 50 class ShelfWidget; |
| 51 class WmShelf; | 51 class WmShelf; |
| 52 | 52 |
| 53 namespace test { | 53 namespace test { |
| 54 class ShelfViewTestAPI; | 54 class ShelfViewTestAPI; |
| 55 } | 55 } |
| 56 | 56 |
| 57 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_BOTTOM; | 57 enum ShelfAlignmentUmaEnumValue { |
| 58 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_LEFT; | 58 SHELF_ALIGNMENT_UMA_ENUM_VALUE_BOTTOM, |
| 59 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_RIGHT; | 59 SHELF_ALIGNMENT_UMA_ENUM_VALUE_LEFT, |
| 60 extern const int SHELF_ALIGNMENT_UMA_ENUM_VALUE_COUNT; | 60 SHELF_ALIGNMENT_UMA_ENUM_VALUE_RIGHT, |
| 61 // Must be last entry in enum. |
| 62 SHELF_ALIGNMENT_UMA_ENUM_VALUE_COUNT, |
| 63 }; |
| 61 | 64 |
| 62 class ASH_EXPORT ShelfView : public views::View, | 65 class ASH_EXPORT ShelfView : public views::View, |
| 63 public ShelfModelObserver, | 66 public ShelfModelObserver, |
| 64 public InkDropButtonListener, | 67 public InkDropButtonListener, |
| 65 public views::ContextMenuController, | 68 public views::ContextMenuController, |
| 66 public views::FocusTraversable, | 69 public views::FocusTraversable, |
| 67 public views::BoundsAnimatorObserver, | 70 public views::BoundsAnimatorObserver, |
| 68 public app_list::ApplicationDragAndDropHost { | 71 public app_list::ApplicationDragAndDropHost { |
| 69 public: | 72 public: |
| 70 ShelfView(ShelfModel* model, | 73 ShelfView(ShelfModel* model, |
| (...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; | 468 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; |
| 466 | 469 |
| 467 base::WeakPtrFactory<ShelfView> weak_factory_; | 470 base::WeakPtrFactory<ShelfView> weak_factory_; |
| 468 | 471 |
| 469 DISALLOW_COPY_AND_ASSIGN(ShelfView); | 472 DISALLOW_COPY_AND_ASSIGN(ShelfView); |
| 470 }; | 473 }; |
| 471 | 474 |
| 472 } // namespace ash | 475 } // namespace ash |
| 473 | 476 |
| 474 #endif // ASH_COMMON_SHELF_SHELF_VIEW_H_ | 477 #endif // ASH_COMMON_SHELF_SHELF_VIEW_H_ |
| OLD | NEW |