Chromium Code Reviews| 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/launcher/launcher_types.h" | 9 #include "ash/shelf/shelf_constants.h" |
| 10 #include "ash/shelf/shelf_types.h" | 10 #include "ash/shelf/shelf_types.h" |
|
tfarina
2014/01/01 19:25:43
do you prefer that I move it into shelf_types.h?
| |
| 11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
| 12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 13 #include "ui/gfx/size.h" | 13 #include "ui/gfx/size.h" |
| 14 #include "ui/views/widget/widget_observer.h" | 14 #include "ui/views/widget/widget_observer.h" |
| 15 | 15 |
| 16 namespace app_list { | 16 namespace app_list { |
| 17 class ApplicationDragAndDropHost; | 17 class ApplicationDragAndDropHost; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace aura { | 20 namespace aura { |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 122 ShelfDelegate* delegate_; | 122 ShelfDelegate* delegate_; |
| 123 | 123 |
| 124 ShelfWidget* shelf_widget_; | 124 ShelfWidget* shelf_widget_; |
| 125 | 125 |
| 126 DISALLOW_COPY_AND_ASSIGN(Shelf); | 126 DISALLOW_COPY_AND_ASSIGN(Shelf); |
| 127 }; | 127 }; |
| 128 | 128 |
| 129 } // namespace ash | 129 } // namespace ash |
| 130 | 130 |
| 131 #endif // ASH_SHELF_SHELF_H_ | 131 #endif // ASH_SHELF_SHELF_H_ |
| OLD | NEW |