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

Unified Diff: ash/common/system/user/user_view.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: ash/common/system/user/user_view.cc
diff --git a/ash/common/system/user/user_view.cc b/ash/common/system/user/user_view.cc
index 3f20a7fdf00fa41fe997590fc2355832be32e21c..913ffd0af34e23f7d0bfde71a1f93e2ba02da4ff 100644
--- a/ash/common/system/user/user_view.cc
+++ b/ash/common/system/user/user_view.cc
@@ -50,7 +50,7 @@ namespace {
// Switch to a user with the given |user_index|.
void SwitchUser(UserIndex user_index) {
// Do not switch users when the log screen is presented.
- SessionController* controller = WmShell::Get()->session_controller();
+ SessionController* controller = Shell::Get()->session_controller();
if (controller->IsUserSessionBlocked())
return;
@@ -68,7 +68,7 @@ void SwitchUser(UserIndex user_index) {
bool IsMultiProfileSupportedAndUserActive() {
return Shell::Get()->shell_delegate()->IsMultiProfilesEnabled() &&
- !WmShell::Get()->session_controller()->IsUserSessionBlocked();
+ !Shell::Get()->session_controller()->IsUserSessionBlocked();
}
// Creates the view shown in the user switcher popup ("AddUserMenuOption").
@@ -352,7 +352,7 @@ void UserView::ToggleAddUserMenuOption() {
add_menu_option_->Init(params);
const AddUserSessionPolicy add_user_policy =
- WmShell::Get()->session_controller()->GetAddUserPolicy();
+ Shell::Get()->session_controller()->GetAddUserPolicy();
add_user_enabled_ = add_user_policy == AddUserSessionPolicy::ALLOWED;
// Position the widget on top of the user card view (which is still in the
« no previous file with comments | « ash/common/system/user/user_card_view.cc ('k') | ash/common/system/web_notification/web_notification_tray.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698