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

Unified Diff: ash/common/system/user/tray_user.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
« no previous file with comments | « ash/common/system/user/login_status.cc ('k') | ash/common/system/user/tray_user_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/user/tray_user.cc
diff --git a/ash/common/system/user/tray_user.cc b/ash/common/system/user/tray_user.cc
index bc4813180efaad1f777afb04e63420a1a9a84883..c9035d3d84db5730af29909b682303fe25c0583a 100644
--- a/ash/common/system/user/tray_user.cc
+++ b/ash/common/system/user/tray_user.cc
@@ -82,7 +82,7 @@ views::View* TrayUser::CreateDefaultView(LoginStatus status) {
if (status == LoginStatus::NOT_LOGGED_IN)
return nullptr;
const SessionController* const session_controller =
- WmShell::Get()->session_controller();
+ Shell::Get()->session_controller();
// If the screen is locked or a system modal dialog box is shown, show only
// the currently active user.
@@ -224,7 +224,7 @@ void TrayUser::OnUserUpdate() {
void TrayUser::OnUserAddedToSession() {
const SessionController* const session_controller =
- WmShell::Get()->session_controller();
+ Shell::Get()->session_controller();
// Only create views for user items which are logged in.
if (user_index_ >= session_controller->NumberOfLoggedInUsers())
return;
@@ -238,7 +238,7 @@ void TrayUser::OnUserAddedToSession() {
void TrayUser::UpdateAvatarImage(LoginStatus status) {
const SessionController* const session_controller =
- WmShell::Get()->session_controller();
+ Shell::Get()->session_controller();
if (!avatar_ || user_index_ >= session_controller->NumberOfLoggedInUsers())
return;
« no previous file with comments | « ash/common/system/user/login_status.cc ('k') | ash/common/system/user/tray_user_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698