Chromium Code Reviews| Index: ash/system/tray/system_tray.h |
| diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h |
| index 064dda51450d535872cdc829f55f1d10383943b7..ac31bce61838ea05ad1ff7565e5db7a25f0e9678 100644 |
| --- a/ash/system/tray/system_tray.h |
| +++ b/ash/system/tray/system_tray.h |
| @@ -10,11 +10,10 @@ |
| #include <vector> |
| #include "ash/ash_export.h" |
| +#include "ash/common/system/tray/system_tray_bubble.h" |
| +#include "ash/common/system/tray/tray_background_view.h" |
| #include "ash/system/cast/tray_cast.h" |
| -#include "ash/system/tray/system_tray_bubble.h" |
| -#include "ash/system/tray/tray_background_view.h" |
| #include "ash/system/user/login_status.h" |
| -#include "base/compiler_specific.h" |
| #include "base/macros.h" |
| #include "base/memory/scoped_vector.h" |
| #include "ui/views/bubble/tray_bubble_view.h" |
| @@ -22,6 +21,7 @@ |
| namespace ash { |
| class ScreenTrayItem; |
| +class StatusAreaWidget; |
| class SystemBubbleWrapper; |
| class SystemTrayDelegate; |
| class SystemTrayItem; |
| @@ -213,6 +213,8 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView, |
| // Overridden from ActionableView. |
| bool PerformAction(const ui::Event& event) override; |
| + StatusAreaWidget* status_area_widget_; |
|
msw
2016/06/23 22:17:27
nit: comment
James Cook
2016/06/23 22:44:18
Done.
|
| + |
| // Owned items. |
| ScopedVector<SystemTrayItem> items_; |