chrome/browser/ui/ash/system_tray_delegate_chromeos.cc - Issue 785893003: Adapt Chrome OS related part of ChildAccountService.

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/system_tray_delegate_chromeos.cc

Issue 785893003: Adapt Chrome OS related part of ChildAccountService. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: DCHECK removed. Created 6 years 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: chrome/browser/ui/ash/system_tray_delegate_chromeos.cc

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

index a02c7c7da1c1d48ab445ed3f800b488c3d2ea877..2c95d51e3f52e65cc20deb8b0f487fd9a98237b7 100644

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

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

@@ -840,9 +840,10 @@ void SystemTrayDelegateChromeOS::UserAddedToSession(

void SystemTrayDelegateChromeOS::UserChangedSupervisedStatus(

user_manager::User* user) {

Profile* user_profile = ProfileHelper::Get()->GetProfileByUser(user);

- DCHECK(user_profile);

- if (session_started_ && user_profile_ == user_profile) {

+ if (session_started_ &&

+ user_profile != NULL &&

Marc Treib 2014/12/10 12:42:36 Maybe add a comment explaining when user_profile c

+ user_profile_ == user_profile) {

ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(

GetUserLoginStatus());

}

« no previous file with comments | « chrome/browser/supervised_user/child_accounts/child_account_service.cc ('k') | components/user_manager/user.cc » ('j') | no next file with comments »