chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc - Issue 2111443002: mash: Migrate SessionStateDelegate 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: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

Issue 2111443002: mash: Migrate SessionStateDelegate access to WmShell. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments. Created 4 years, 6 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

« chrome/browser/ui/ash/network_connect_delegate_chromeos.cc ('K') | « chrome/browser/ui/views/frame/system_menu_model_builder.cc ('k') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

diff --git a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

index 88971eaa06931cc1a1245d12e71b10a0fe8e1226..6275080805ff6b634135aa0a1dccebe3f52a2822 100644

--- a/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

+++ b/chrome/browser/ui/webui/chromeos/login/signin_screen_handler.cc

@@ -10,6 +10,7 @@

#include <vector>

#include "ash/common/system/chromeos/devicetype_utils.h"

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

#include "ash/shell.h"

#include "ash/wm/lock_state_controller.h"

#include "base/bind.h"

@@ -1299,7 +1300,7 @@ void SigninScreenHandler::HandleFocusPod(const AccountId& account_id) {

user_manager::UserManager::Get()->FindUser(account_id);

// |user| may be nullptr in kiosk mode or unit tests.

if (user && user->is_logged_in() && !user->is_active()) {

- ash::Shell::GetInstance()->session_state_delegate()->SwitchActiveUser(

+ ash::WmShell::Get()->GetSessionStateDelegate()->SwitchActiveUser(

account_id);

} else {

SetUserInputMethod(account_id.GetUserEmail(), ime_state_.get());