| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_H_ | 5 #ifndef ASH_SHELF_SHELF_H_ |
| 6 #define ASH_SHELF_SHELF_H_ | 6 #define ASH_SHELF_SHELF_H_ |
| 7 | 7 |
| 8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
| 9 #include "ash/shelf/shelf_constants.h" | 9 #include "ash/shelf/shelf_constants.h" |
| 10 #include "ash/shelf/shelf_types.h" | 10 #include "ash/shelf/shelf_types.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 } | 26 } |
| 27 | 27 |
| 28 namespace views { | 28 namespace views { |
| 29 class View; | 29 class View; |
| 30 } | 30 } |
| 31 | 31 |
| 32 namespace ash { | 32 namespace ash { |
| 33 class FocusCycler; | 33 class FocusCycler; |
| 34 class ShelfDelegate; | 34 class ShelfDelegate; |
| 35 class ShelfIconObserver; | 35 class ShelfIconObserver; |
| 36 class ShelfLayoutManager; | |
| 37 class ShelfModel; | 36 class ShelfModel; |
| 38 class ShelfView; | 37 class ShelfView; |
| 39 class ShelfWidget; | 38 class ShelfWidget; |
| 40 | 39 |
| 41 namespace test { | 40 namespace test { |
| 42 class ShelfTestAPI; | 41 class ShelfTestAPI; |
| 43 } | 42 } |
| 44 | 43 |
| 45 | 44 |
| 46 class ASH_EXPORT Shelf { | 45 class ASH_EXPORT Shelf { |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 119 ShelfDelegate* delegate_; | 118 ShelfDelegate* delegate_; |
| 120 | 119 |
| 121 ShelfWidget* shelf_widget_; | 120 ShelfWidget* shelf_widget_; |
| 122 | 121 |
| 123 DISALLOW_COPY_AND_ASSIGN(Shelf); | 122 DISALLOW_COPY_AND_ASSIGN(Shelf); |
| 124 }; | 123 }; |
| 125 | 124 |
| 126 } // namespace ash | 125 } // namespace ash |
| 127 | 126 |
| 128 #endif // ASH_SHELF_SHELF_H_ | 127 #endif // ASH_SHELF_SHELF_H_ |
| OLD | NEW |