Condition added to prevent lock animation on Supervised User creation.

ash/wm/power_button_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/power_button_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 54 matching lines @@
   if (volume_down_pressed_ && down &&
       Shell::GetInstance()->maximize_mode_controller()->
         IsMaximizeModeWindowManagerEnabled()) {
     Shell::GetInstance()->accelerator_controller()->PerformActionIfEnabled(
         ash::TAKE_SCREENSHOT);
     return;
   }
 
   const SessionStateDelegate* session_state_delegate =
       Shell::GetInstance()->session_state_delegate();
   if (has_legacy_power_button_) {

[dzhioev (left Google), 2014/12/23 14:08:52]

I think this branch should be updated as well, though I'm not quite sure how.

     // If power button releases won't get reported correctly because we're not
     // running on official hardware, just lock the screen or shut down
     // immediately.
     if (down) {
       if (session_state_delegate->CanLockScreen() &&
           !session_state_delegate->IsScreenLocked() &&
           !controller_->LockRequested()) {
         controller_->StartLockAnimationAndLockImmediately(false);
       } else {
         controller_->RequestShutdown(LockStateController::POWER_OFF);
       }
     }
   } else {  // !has_legacy_power_button_
     if (down) {
       // If we already have a pending request to lock the screen, wait.
       if (controller_->LockRequested())
         return;
 
       if (session_state_delegate->CanLockScreen() &&
-          !session_state_delegate->IsScreenLocked()) {
+          !session_state_delegate->IsScreenLocked() &&

[dzhioev (left Google), 2014/12/23 14:08:52]

IsScreenLocked() implies IsUserSessionBlocked(), so you can drop
!IsScreenLocked() condition.

+          !session_state_delegate->IsUserSessionBlocked()) {
         if (Shell::GetInstance()->maximize_mode_controller()->
             IsMaximizeModeWindowManagerEnabled() && enable_quick_lock_)
           controller_->StartLockAnimationAndLockImmediately(true);
         else
           controller_->StartLockAnimation(true);
       } else {
         controller_->StartShutdownAnimation();
       }
     } else {  // Button is up.
       if (controller_->CanCancelLockAnimation())
@@ skipping 47 matching lines @@
     } else if (state.display->current_mode()) {
       external_display_on = true;
     }
   }
   internal_display_off_and_external_display_on_ =
       internal_display_off && external_display_on;
 }
 #endif
 
 }  // namespace ash