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

Unified Diff: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

Issue 2761373002: Move yet 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
Index: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
index ccc9cd233818c57bf7357884b2872cb41ff236ac..787ef3d50a5ed46b1d7a53eb7d7d03d1100c2c46 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc
@@ -462,7 +462,7 @@ void SystemTrayDelegateChromeOS::UserChangedChildStatus(
// Returned user_profile might be NULL on restoring Users on browser start.
// At some point profile is not yet fully initiated.
if (session_started_ && user_profile && user_profile_ == user_profile)
- ash::WmShell::Get()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
+ ash::Shell::Get()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
}
ash::SystemTrayNotifier* SystemTrayDelegateChromeOS::GetSystemTrayNotifier() {
@@ -619,11 +619,11 @@ void SystemTrayDelegateChromeOS::NotifyIfLastWindowClosed() {
// Overridden from SessionManagerClient::Observer.
void SystemTrayDelegateChromeOS::ScreenIsLocked() {
- ash::WmShell::Get()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
+ ash::Shell::Get()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
}
void SystemTrayDelegateChromeOS::ScreenIsUnlocked() {
- ash::WmShell::Get()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
+ ash::Shell::Get()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
}
// content::NotificationObserver implementation.
@@ -649,7 +649,7 @@ void SystemTrayDelegateChromeOS::Observe(
}
case chrome::NOTIFICATION_SESSION_STARTED: {
session_started_ = true;
- ash::WmShell::Get()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
+ ash::Shell::Get()->UpdateAfterLoginStatusChange(GetUserLoginStatus());
SetProfile(ProfileManager::GetActiveUserProfile());
break;
}

Powered by Google App Engine
This is Rietveld 408576698