| 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 24 matching lines...) Expand all Loading... |
| 35 class BoundsAnimator; | 35 class BoundsAnimator; |
| 36 class MenuModelAdapter; | 36 class MenuModelAdapter; |
| 37 class MenuRunner; | 37 class MenuRunner; |
| 38 } | 38 } |
| 39 | 39 |
| 40 namespace ash { | 40 namespace ash { |
| 41 class AppListButton; | 41 class AppListButton; |
| 42 class DragImageView; | 42 class DragImageView; |
| 43 class OverflowBubble; | 43 class OverflowBubble; |
| 44 class OverflowButton; | 44 class OverflowButton; |
| 45 class ScopedTargetRootWindow; | 45 class ScopedRootWindowForNewWindows; |
| 46 class Shelf; | 46 class Shelf; |
| 47 class ShelfButton; | 47 class ShelfButton; |
| 48 class ShelfDelegate; | 48 class ShelfDelegate; |
| 49 class ShelfIconObserver; | 49 class ShelfIconObserver; |
| 50 class ShelfModel; | 50 class ShelfModel; |
| 51 struct ShelfItem; | 51 struct ShelfItem; |
| 52 class WmShelf; | 52 class WmShelf; |
| 53 | 53 |
| 54 namespace test { | 54 namespace test { |
| 55 class ShelfViewTestAPI; | 55 class ShelfViewTestAPI; |
| (...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 390 | 390 |
| 391 // Used for the context menu of a particular item. | 391 // Used for the context menu of a particular item. |
| 392 ShelfID context_menu_id_; | 392 ShelfID context_menu_id_; |
| 393 | 393 |
| 394 std::unique_ptr<views::FocusSearch> focus_search_; | 394 std::unique_ptr<views::FocusSearch> focus_search_; |
| 395 | 395 |
| 396 // Manages the context menu, and the list menu. | 396 // Manages the context menu, and the list menu. |
| 397 std::unique_ptr<ui::MenuModel> menu_model_; | 397 std::unique_ptr<ui::MenuModel> menu_model_; |
| 398 std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_; | 398 std::unique_ptr<views::MenuModelAdapter> menu_model_adapter_; |
| 399 std::unique_ptr<views::MenuRunner> launcher_menu_runner_; | 399 std::unique_ptr<views::MenuRunner> launcher_menu_runner_; |
| 400 std::unique_ptr<ScopedTargetRootWindow> scoped_target_root_window_; | 400 std::unique_ptr<ScopedRootWindowForNewWindows> |
| 401 scoped_root_window_for_new_windows_; |
| 401 | 402 |
| 402 base::ObserverList<ShelfIconObserver> observers_; | 403 base::ObserverList<ShelfIconObserver> observers_; |
| 403 | 404 |
| 404 // Amount content is inset on the left edge (or top edge for vertical | 405 // Amount content is inset on the left edge (or top edge for vertical |
| 405 // alignment). | 406 // alignment). |
| 406 int leading_inset_; | 407 int leading_inset_; |
| 407 | 408 |
| 408 ShelfGestureHandler gesture_handler_; | 409 ShelfGestureHandler gesture_handler_; |
| 409 | 410 |
| 410 // True when an item being inserted or removed in the model cancels a drag. | 411 // True when an item being inserted or removed in the model cancels a drag. |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 467 | 468 |
| 468 // Tracks UMA metrics based on shelf button press actions. | 469 // Tracks UMA metrics based on shelf button press actions. |
| 469 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; | 470 ShelfButtonPressedMetricTracker shelf_button_pressed_metric_tracker_; |
| 470 | 471 |
| 471 DISALLOW_COPY_AND_ASSIGN(ShelfView); | 472 DISALLOW_COPY_AND_ASSIGN(ShelfView); |
| 472 }; | 473 }; |
| 473 | 474 |
| 474 } // namespace ash | 475 } // namespace ash |
| 475 | 476 |
| 476 #endif // ASH_SHELF_SHELF_VIEW_H_ | 477 #endif // ASH_SHELF_SHELF_VIEW_H_ |
| OLD | NEW |