| 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_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ | 5 #ifndef ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ |
| 6 #define ASH_COMMON_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/common/shelf/shelf_background_animator_observer.h" | 11 #include "ash/common/shelf/shelf_background_animator_observer.h" |
| 12 #include "ash/common/system/tray/actionable_view.h" | |
| 13 #include "ash/public/cpp/shelf_types.h" | 12 #include "ash/public/cpp/shelf_types.h" |
| 13 #include "ash/system/tray/actionable_view.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/gfx/geometry/insets.h" | 16 #include "ui/gfx/geometry/insets.h" |
| 17 #include "ui/views/bubble/tray_bubble_view.h" | 17 #include "ui/views/bubble/tray_bubble_view.h" |
| 18 | 18 |
| 19 namespace ash { | 19 namespace ash { |
| 20 class TrayEventFilter; | 20 class TrayEventFilter; |
| 21 class TrayBackground; | 21 class TrayBackground; |
| 22 class WmShelf; | 22 class WmShelf; |
| 23 | 23 |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 187 bool separator_visible_; | 187 bool separator_visible_; |
| 188 | 188 |
| 189 std::unique_ptr<TrayWidgetObserver> widget_observer_; | 189 std::unique_ptr<TrayWidgetObserver> widget_observer_; |
| 190 std::unique_ptr<TrayEventFilter> tray_event_filter_; | 190 std::unique_ptr<TrayEventFilter> tray_event_filter_; |
| 191 | 191 |
| 192 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); | 192 DISALLOW_COPY_AND_ASSIGN(TrayBackgroundView); |
| 193 }; | 193 }; |
| 194 | 194 |
| 195 } // namespace ash | 195 } // namespace ash |
| 196 | 196 |
| 197 #endif // ASH_COMMON_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ | 197 #endif // ASH_SYSTEM_TRAY_TRAY_BACKGROUND_VIEW_H_ |
| OLD | NEW |