| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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_BACKGROUND_ANIMATOR_H_ | 5 #ifndef ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ |
| 6 #define ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ | 6 #define ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "ash/ash_export.h" | 10 #include "ash/ash_export.h" |
| 11 #include "ash/common/shelf/shelf_types.h" | |
| 12 #include "ash/common/shelf/wm_shelf_observer.h" | 11 #include "ash/common/shelf/wm_shelf_observer.h" |
| 13 #include "ash/common/wm/background_animator.h" | 12 #include "ash/common/wm/background_animator.h" |
| 13 #include "ash/public/cpp/shelf_types.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "base/observer_list.h" | 15 #include "base/observer_list.h" |
| 16 | 16 |
| 17 namespace ash { | 17 namespace ash { |
| 18 | 18 |
| 19 class ShelfBackgroundAnimatorObserver; | 19 class ShelfBackgroundAnimatorObserver; |
| 20 class ShelfBackgroundAnimatorTestApi; | 20 class ShelfBackgroundAnimatorTestApi; |
| 21 class WmShelf; | 21 class WmShelf; |
| 22 | 22 |
| 23 // Central controller for the Shelf and Dock opacity animations. | 23 // Central controller for the Shelf and Dock opacity animations. |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 128 | 128 |
| 129 // The shelf to observe for changes to the shelf background type, can be null. | 129 // The shelf to observe for changes to the shelf background type, can be null. |
| 130 WmShelf* wm_shelf_; | 130 WmShelf* wm_shelf_; |
| 131 | 131 |
| 132 DISALLOW_COPY_AND_ASSIGN(ShelfBackgroundAnimator); | 132 DISALLOW_COPY_AND_ASSIGN(ShelfBackgroundAnimator); |
| 133 }; | 133 }; |
| 134 | 134 |
| 135 } // namespace ash | 135 } // namespace ash |
| 136 | 136 |
| 137 #endif // ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ | 137 #endif // ASH_COMMON_SHELF_SHELF_BACKGROUND_ANIMATOR_H_ |
| OLD | NEW |