Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ash / shelf / shelf_widget.cc

diff --git a/src/ash/shelf/shelf_widget.cc b/src/ash/shelf/shelf_widget.cc
index f912011..2d89253 100644 (file)
--- a/src/ash/shelf/shelf_widget.cc
+++ b/src/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();