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

Unified Diff: ash/system/chromeos/enterprise/tray_enterprise.cc

Issue 2058173002: mash: Move SystemTrayDelegate ownership to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review feedback Created 4 years, 6 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
Index: ash/system/chromeos/enterprise/tray_enterprise.cc
diff --git a/ash/system/chromeos/enterprise/tray_enterprise.cc b/ash/system/chromeos/enterprise/tray_enterprise.cc
index 96047b0b7acfc53f84f40f64513e2d234be7de62..a082a3db9e44629c45420270a0afe08d95c7a608 100644
--- a/ash/system/chromeos/enterprise/tray_enterprise.cc
+++ b/ash/system/chromeos/enterprise/tray_enterprise.cc
@@ -5,6 +5,7 @@
#include "ash/system/chromeos/enterprise/tray_enterprise.h"
#include "ash/common/system/tray/system_tray_delegate.h"
+#include "ash/common/wm_shell.h"
#include "ash/shell.h"
#include "ash/system/chromeos/label_tray_view.h"
#include "ash/system/tray/system_tray_notifier.h"
@@ -28,8 +29,8 @@ TrayEnterprise::~TrayEnterprise() {
}
void TrayEnterprise::UpdateEnterpriseMessage() {
- base::string16 message = Shell::GetInstance()->system_tray_delegate()->
- GetEnterpriseMessage();
+ base::string16 message =
+ WmShell::Get()->system_tray_delegate()->GetEnterpriseMessage();
if (tray_view_)
tray_view_->SetMessage(message);
}
@@ -54,7 +55,7 @@ void TrayEnterprise::OnEnterpriseDomainChanged() {
}
void TrayEnterprise::OnViewClicked(views::View* sender) {
- Shell::GetInstance()->system_tray_delegate()->ShowEnterpriseInfo();
+ WmShell::Get()->system_tray_delegate()->ShowEnterpriseInfo();
}
} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698