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

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

Issue 2761063002: Move more from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 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/common/system/chromeos/cast/tray_cast.cc ('k') | ash/common/system/chromeos/ime_menu/ime_list_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/chromeos/enterprise/tray_enterprise.cc
diff --git a/ash/common/system/chromeos/enterprise/tray_enterprise.cc b/ash/common/system/chromeos/enterprise/tray_enterprise.cc
index 26f48caba17854093ab419d6b6cd83ee555fdcab..6083dfa908c41b1763282eda231cfff7eff590a1 100644
--- a/ash/common/system/chromeos/enterprise/tray_enterprise.cc
+++ b/ash/common/system/chromeos/enterprise/tray_enterprise.cc
@@ -10,6 +10,7 @@
#include "ash/common/system/tray/system_tray_notifier.h"
#include "ash/common/wm_shell.h"
#include "ash/resources/grit/ash_resources.h"
+#include "ash/shell.h"
#include "base/logging.h"
#include "base/strings/string16.h"
@@ -26,7 +27,7 @@ TrayEnterprise::~TrayEnterprise() {
void TrayEnterprise::UpdateEnterpriseMessage() {
base::string16 message =
- WmShell::Get()->system_tray_delegate()->GetEnterpriseMessage();
+ Shell::Get()->system_tray_delegate()->GetEnterpriseMessage();
if (tray_view_)
tray_view_->SetMessage(message);
}
@@ -51,7 +52,7 @@ void TrayEnterprise::OnEnterpriseDomainChanged() {
}
void TrayEnterprise::OnViewClicked(views::View* sender) {
- WmShell::Get()->system_tray_delegate()->ShowEnterpriseInfo();
+ Shell::Get()->system_tray_delegate()->ShowEnterpriseInfo();
}
} // namespace ash
« no previous file with comments | « ash/common/system/chromeos/cast/tray_cast.cc ('k') | ash/common/system/chromeos/ime_menu/ime_list_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698