chrome/browser/ui/ash/session_state_delegate_chromeos.cc - Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen)

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/ash/session_state_delegate_chromeos.cc

Issue 357323002: Tray elements behave appropriately on the multiple signin screen (more like lock screen) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixed nits Created 6 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

« ash/session/session_state_delegate.h ('K') | « chrome/browser/ui/ash/session_state_delegate_chromeos.h ('k') | chrome/browser/ui/ash/session_state_delegate_views.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/session_state_delegate_chromeos.cc

diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc

index 171bca555430c26bcfb853e59638fce1b3edd917..280d47c94303c7717371477f1ec3b180ab28198a 100644

--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.cc

+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.cc

@@ -214,6 +214,13 @@ void SessionStateDelegateChromeos::RemoveSessionStateObserver(

session_state_observer_list_.RemoveObserver(observer);

}

+void SessionStateDelegateChromeos::HideMultiUserSigninScreen() {

+ if (this->GetSessionState() ==

oshima 2014/07/16 20:43:30 remove "this->"

+ ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY) {

+ chromeos::UserAddingScreen::Get()->Cancel();

+ }

void SessionStateDelegateChromeos::LoggedInStateChanged() {

SetSessionState(chromeos::LoginState::Get()->IsUserLoggedIn() ?

SESSION_STATE_ACTIVE : SESSION_STATE_LOGIN_PRIMARY, false);