ash/system/user/user_view.cc - Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/user/user_view.cc

Issue 2118593002: mash: Migrate ShellDelegate ownership and access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 5 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/user/user_view.cc

diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc

index f20ba284911924b94e90082e58bae6076bfb6af7..5b5050a8d1d0b7be308c343fb5f1cfe0c1fee257 100644

--- a/ash/system/user/user_view.cc

+++ b/ash/system/user/user_view.cc

@@ -8,6 +8,7 @@

#include <utility>

#include "ash/common/session/session_state_delegate.h"

+#include "ash/common/shell_delegate.h"

#include "ash/common/shell_window_ids.h"

#include "ash/common/system/tray/system_tray_delegate.h"

#include "ash/common/system/tray/tray_constants.h"

@@ -22,8 +23,6 @@

#include "ash/common/wm_window.h"

#include "ash/multi_profile_uma.h"

#include "ash/popup_message.h"

-#include "ash/shell.h"

-#include "ash/shell_delegate.h"

#include "ash/system/tray/system_tray.h"

#include "ash/system/user/user_card_view.h"

#include "components/signin/core/account_id/account_id.h"

@@ -85,7 +84,7 @@ void SwitchUser(UserIndex user_index) {

}

bool IsMultiProfileSupportedAndUserActive() {

- return Shell::GetInstance()->delegate()->IsMultiProfilesEnabled() &&

+ return WmShell::Get()->delegate()->IsMultiProfilesEnabled() &&

!WmShell::Get()->GetSessionStateDelegate()->IsUserSessionBlocked();

}

« no previous file with comments | « ash/system/user/tray_user_unittest.cc ('k') | ash/sysui/keyboard_ui_mus.cc » ('j') | no next file with comments »