| 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_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ | 5 #ifndef ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ |
| 6 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ | 6 #define ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_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/shelf/background_animator.h" | |
| 12 #include "ash/shelf/shelf_types.h" | 11 #include "ash/shelf/shelf_types.h" |
| 13 #include "ash/system/tray/actionable_view.h" | 12 #include "ash/system/tray/actionable_view.h" |
| 13 #include "ash/wm/common/background_animator.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "ui/compositor/layer_animation_observer.h" | 15 #include "ui/compositor/layer_animation_observer.h" |
| 16 #include "ui/views/bubble/tray_bubble_view.h" | 16 #include "ui/views/bubble/tray_bubble_view.h" |
| 17 | 17 |
| 18 namespace ash { | 18 namespace ash { |
| 19 class ShelfLayoutManager; | 19 class ShelfLayoutManager; |
| 20 class StatusAreaWidget; | 20 class StatusAreaWidget; |
| 21 class TrayEventFilter; | 21 class TrayEventFilter; |
| 22 class TrayBackground; | 22 class TrayBackground; |
| 23 | 23 |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 192 | 192 |
| 193 std::unique_ptr<TrayWidgetObserver> widget_observer_; | 193 std::unique_ptr<TrayWidgetObserver> widget_observer_; |
| 194 std::unique_ptr<TrayEventFilter> tray_event_filter_; | 194 std::unique_ptr<TrayEventFilter> tray_event_filter_; |
| 195 | 195 |
| 196 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); | 196 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); |
| 197 }; | 197 }; |
| 198 | 198 |
| 199 } // namespace ash | 199 } // namespace ash |
| 200 | 200 |
| 201 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ | 201 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ |
| OLD | NEW |