| Index: ash/system/tray/system_tray.h
|
| diff --git a/ash/system/tray/system_tray.h b/ash/system/tray/system_tray.h
|
| index 0ea8505170823d94fecc50cb3e0b98c89cfd77f9..5e5244d1441954ae5ebddf7339ddf1c5bf2d94d2 100644
|
| --- a/ash/system/tray/system_tray.h
|
| +++ b/ash/system/tray/system_tray.h
|
| @@ -27,6 +27,7 @@ class SystemTrayItem;
|
| class TrayAccessibility;
|
| class TrayAudio;
|
| class TrayCast;
|
| +class TrayEnterprise;
|
| class TrayNetwork;
|
| class TraySupervisedUser;
|
| class TraySystemInfo;
|
| @@ -141,7 +142,9 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
|
| return tray_accessibility_;
|
| }
|
|
|
| + // TODO(jamescook): Add a SystemTrayTestApi instead of these methods.
|
| TrayCast* GetTrayCastForTesting() const;
|
| + TrayEnterprise* GetTrayEnterpriseForTesting() const;
|
| TrayNetwork* GetTrayNetworkForTesting() const;
|
| TraySupervisedUser* GetTraySupervisedUserForTesting() const;
|
| TraySystemInfo* GetTraySystemInfoForTesting() const;
|
| @@ -223,8 +226,9 @@ class ASH_EXPORT SystemTray : public TrayBackgroundView,
|
|
|
| // These objects are not owned by this class.
|
| TrayAccessibility* tray_accessibility_ = nullptr;
|
| - TrayAudio* tray_audio_ = nullptr; // May be null.
|
| + TrayAudio* tray_audio_ = nullptr;
|
| TrayCast* tray_cast_ = nullptr;
|
| + TrayEnterprise* tray_enterprise_ = nullptr;
|
| TrayNetwork* tray_network_ = nullptr;
|
| TrayTiles* tray_tiles_ = nullptr;
|
| TraySupervisedUser* tray_supervised_user_ = nullptr;
|
|
|