| 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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 152 void PointerPressedOnButton(views::View* view, | 152 void PointerPressedOnButton(views::View* view, |
| 153 Pointer pointer, | 153 Pointer pointer, |
| 154 const ui::LocatedEvent& event); | 154 const ui::LocatedEvent& event); |
| 155 void PointerDraggedOnButton(views::View* view, | 155 void PointerDraggedOnButton(views::View* view, |
| 156 Pointer pointer, | 156 Pointer pointer, |
| 157 const ui::LocatedEvent& event); | 157 const ui::LocatedEvent& event); |
| 158 void PointerReleasedOnButton(views::View* view, | 158 void PointerReleasedOnButton(views::View* view, |
| 159 Pointer pointer, | 159 Pointer pointer, |
| 160 bool canceled); | 160 bool canceled); |
| 161 | 161 |
| 162 // Updates the background for the shelf items. |
| 163 void UpdateShelfItemBackground(int alpha); |
| 164 |
| 162 // Return the view model for test purposes. | 165 // Return the view model for test purposes. |
| 163 const views::ViewModel* view_model_for_test() const { | 166 const views::ViewModel* view_model_for_test() const { |
| 164 return view_model_.get(); | 167 return view_model_.get(); |
| 165 } | 168 } |
| 166 | 169 |
| 167 private: | 170 private: |
| 168 friend class ash::test::ShelfViewTestAPI; | 171 friend class ash::test::ShelfViewTestAPI; |
| 169 | 172 |
| 170 class FadeOutAnimationDelegate; | 173 class FadeOutAnimationDelegate; |
| 171 class StartFadeAnimationDelegate; | 174 class StartFadeAnimationDelegate; |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 467 | 470 |
| 468 // Tracks UMA metrics based on shelf button press actions. | 471 // Tracks UMA metrics based on shelf button press actions. |
| 469 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; | 472 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; |
| 470 | 473 |
| 471 DISALLOW_COPY_AND_ASSIGN(ShelfView); | 474 DISALLOW_COPY_AND_ASSIGN(ShelfView); |
| 472 }; | 475 }; |
| 473 | 476 |
| 474 } // namespace ash | 477 } // namespace ash |
| 475 | 478 |
| 476 #endif // ASH_SHELF_SHELF_VIEW_H_ | 479 #endif // ASH_SHELF_SHELF_VIEW_H_ |
| OLD | NEW |