| 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 <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 248 void GetAccessibleState(ui::AXViewState* state) override; | 248 void GetAccessibleState(ui::AXViewState* state) override; |
| 249 | 249 |
| 250 // Overridden from ui::EventHandler: | 250 // Overridden from ui::EventHandler: |
| 251 void OnGestureEvent(ui::GestureEvent* event) override; | 251 void OnGestureEvent(ui::GestureEvent* event) override; |
| 252 | 252 |
| 253 // Overridden from ShelfModelObserver: | 253 // Overridden from ShelfModelObserver: |
| 254 void ShelfItemAdded(int model_index) override; | 254 void ShelfItemAdded(int model_index) override; |
| 255 void ShelfItemRemoved(int model_index, ShelfID id) override; | 255 void ShelfItemRemoved(int model_index, ShelfID id) override; |
| 256 void ShelfItemChanged(int model_index, const ShelfItem& old_item) override; | 256 void ShelfItemChanged(int model_index, const ShelfItem& old_item) override; |
| 257 void ShelfItemMoved(int start_index, int target_index) override; | 257 void ShelfItemMoved(int start_index, int target_index) override; |
| 258 void ShelfStatusChanged() override; | |
| 259 | 258 |
| 260 // Overridden from ShelfButtonHost: | 259 // Overridden from ShelfButtonHost: |
| 261 void PointerPressedOnButton(views::View* view, | 260 void PointerPressedOnButton(views::View* view, |
| 262 Pointer pointer, | 261 Pointer pointer, |
| 263 const ui::LocatedEvent& event) override; | 262 const ui::LocatedEvent& event) override; |
| 264 void PointerDraggedOnButton(views::View* view, | 263 void PointerDraggedOnButton(views::View* view, |
| 265 Pointer pointer, | 264 Pointer pointer, |
| 266 const ui::LocatedEvent& event) override; | 265 const ui::LocatedEvent& event) override; |
| 267 void PointerReleasedOnButton(views::View* view, | 266 void PointerReleasedOnButton(views::View* view, |
| 268 Pointer pointer, | 267 Pointer pointer, |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 446 | 445 |
| 447 // Tracks UMA metrics based on shelf button press actions. | 446 // Tracks UMA metrics based on shelf button press actions. |
| 448 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; | 447 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; |
| 449 | 448 |
| 450 DISALLOW_COPY_AND_ASSIGN(ShelfView); | 449 DISALLOW_COPY_AND_ASSIGN(ShelfView); |
| 451 }; | 450 }; |
| 452 | 451 |
| 453 } // namespace ash | 452 } // namespace ash |
| 454 | 453 |
| 455 #endif // ASH_SHELF_SHELF_VIEW_H_ | 454 #endif // ASH_SHELF_SHELF_VIEW_H_ |
| OLD | NEW |