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

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

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/tray/system_tray.h ('k') | ash/system/tray/system_tray_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/tray/system_tray.cc
diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc
index 65de3c14664b513d21578d8677dc98b94e2146c5..6feff3c8b2203bb9b09901550567beeeb879726a 100644
--- a/ash/system/tray/system_tray.cc
+++ b/ash/system/tray/system_tray.cc
@@ -246,14 +246,13 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
// Otherwise it could be a main axis margin on the tray's box layout.
AddTrayItem(base::MakeUnique<PaddingTrayItem>());
- tray_accessibility_ = new TrayAccessibility(this);
- tray_update_ = new TrayUpdate(this);
-
AddTrayItem(base::MakeUnique<TraySessionLengthLimit>(this));
- AddTrayItem(base::MakeUnique<TrayEnterprise>(this));
+ tray_enterprise_ = new TrayEnterprise(this);
+ AddTrayItem(base::WrapUnique(tray_enterprise_));
tray_supervised_user_ = new TraySupervisedUser(this);
AddTrayItem(base::WrapUnique(tray_supervised_user_));
AddTrayItem(base::MakeUnique<TrayIME>(this));
+ tray_accessibility_ = new TrayAccessibility(this);
AddTrayItem(base::WrapUnique(tray_accessibility_));
AddTrayItem(base::MakeUnique<TrayTracing>(this));
AddTrayItem(
@@ -279,6 +278,7 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {
delegate->CreateRotationLockTrayItem(this);
if (tray_rotation_lock)
AddTrayItem(std::move(tray_rotation_lock));
+ tray_update_ = new TrayUpdate(this);
AddTrayItem(base::WrapUnique(tray_update_));
tray_tiles_ = new TrayTiles(this);
AddTrayItem(base::WrapUnique(tray_tiles_));
@@ -611,6 +611,10 @@ TrayCast* SystemTray::GetTrayCastForTesting() const {
return tray_cast_;
}
+TrayEnterprise* SystemTray::GetTrayEnterpriseForTesting() const {
+ return tray_enterprise_;
+}
+
TrayNetwork* SystemTray::GetTrayNetworkForTesting() const {
return tray_network_;
}
« no previous file with comments | « ash/system/tray/system_tray.h ('k') | ash/system/tray/system_tray_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698