ash/shelf/shelf_widget.cc - Issue 561713002: ash: Add checks for supervised users.

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/shelf/shelf_widget.cc

Issue 561713002: ash: Add checks for supervised users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Default flag value set in user class constructor. Created 6 years, 3 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:

Index: ash/shelf/shelf_widget.cc

diff --git a/ash/shelf/shelf_widget.cc b/ash/shelf/shelf_widget.cc

index f912011365f934f25a5be883108fd0fcb12ada19..2d892535d02c0c3c820c5e08a525ef237cfc3ac0 100644

--- a/ash/shelf/shelf_widget.cc

+++ b/ash/shelf/shelf_widget.cc

@@ -714,6 +714,9 @@ bool ShelfWidget::IsShelfHiddenBehindBlackBar() const {

// static

bool ShelfWidget::ShelfAlignmentAllowed() {

+ if (Shell::GetInstance()->system_tray_delegate()->IsUserSupervised())

+ return false;

user::LoginStatus login_status =

Shell::GetInstance()->system_tray_delegate()->GetUserLoginStatus();

« no previous file with comments | « no previous file | ash/system/chromeos/supervised/tray_supervised_user.h » ('j') | no next file with comments »