| 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_COMMON_SHELF_SHELF_WIDGET_H_ | 5 #ifndef ASH_SHELF_SHELF_WIDGET_H_ |
| 6 #define ASH_COMMON_SHELF_SHELF_WIDGET_H_ | 6 #define ASH_SHELF_SHELF_WIDGET_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "ash/common/shelf/shelf_background_animator.h" | |
| 12 #include "ash/common/shelf/shelf_background_animator_observer.h" | |
| 13 #include "ash/common/shelf/shelf_layout_manager_observer.h" | |
| 14 #include "ash/public/cpp/shelf_types.h" | 11 #include "ash/public/cpp/shelf_types.h" |
| 12 #include "ash/shelf/shelf_background_animator.h" |
| 13 #include "ash/shelf/shelf_background_animator_observer.h" |
| 14 #include "ash/shelf/shelf_layout_manager_observer.h" |
| 15 #include "base/macros.h" | 15 #include "base/macros.h" |
| 16 #include "ui/views/widget/widget.h" | 16 #include "ui/views/widget/widget.h" |
| 17 #include "ui/views/widget/widget_observer.h" | 17 #include "ui/views/widget/widget_observer.h" |
| 18 | 18 |
| 19 namespace app_list { | 19 namespace app_list { |
| 20 class ApplicationDragAndDropHost; | 20 class ApplicationDragAndDropHost; |
| 21 } | 21 } |
| 22 | 22 |
| 23 namespace ash { | 23 namespace ash { |
| 24 enum class AnimationChangeType; | 24 enum class AnimationChangeType; |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 // at the login screen. | 120 // at the login screen. |
| 121 ShelfView* shelf_view_; | 121 ShelfView* shelf_view_; |
| 122 ShelfBackgroundAnimator background_animator_; | 122 ShelfBackgroundAnimator background_animator_; |
| 123 bool activating_as_fallback_; | 123 bool activating_as_fallback_; |
| 124 | 124 |
| 125 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); | 125 DISALLOW_COPY_AND_ASSIGN(ShelfWidget); |
| 126 }; | 126 }; |
| 127 | 127 |
| 128 } // namespace ash | 128 } // namespace ash |
| 129 | 129 |
| 130 #endif // ASH_COMMON_SHELF_SHELF_WIDGET_H_ | 130 #endif // ASH_SHELF_SHELF_WIDGET_H_ |
| OLD | NEW |