Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: ash/system/tray/system_tray.h

Issue 2839043004: chromeos: Refactor ash SystemTrayDelegate enterprise methods to mojo (Closed)
Patch Set: review comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/enterprise/tray_enterprise_unittest.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
« no previous file with comments | « ash/system/enterprise/tray_enterprise_unittest.cc ('k') | ash/system/tray/system_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698