Do not start autoshutdown on lock button press.

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/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 44 matching lines @@
       else
         controller_->RequestShutdown();
     }
   } else {  // !has_legacy_power_button_
     if (down) {
       // If we already have a pending request to lock the screen, wait.
       if (controller_->LockRequested())
         return;
 
       if (controller_->IsEligibleForLock())
-        controller_->StartLockAnimation();
+        controller_->StartLockAnimation(true);
       else
         controller_->StartShutdownAnimation();
     } else {  // Button is up.
       if (controller_->CanCancelLockAnimation())
         controller_->CancelLockAnimation();
       else if (controller_->CanCancelShutdownAnimation())
         controller_->CancelShutdownAnimation();
     }
   }
 }
 
 void PowerButtonController::OnLockButtonEvent(
     bool down, const base::TimeTicks& timestamp) {
   lock_button_down_ = down;
 
   if (controller_->ShutdownRequested() || !controller_->IsEligibleForLock())
     return;
 
   // Bail if we're already locked or are in the process of locking.  Also give
   // the power button precedence over the lock button (we don't expect both
   // buttons to be present, so this is just making sure that we don't do
   // something completely stupid if that assumption changes later).
   if (power_button_down_)
     return;
 
   if (controller_->IsLocked() || controller_->LockRequested())
     return;
 
   if (down)
-    controller_->StartLockAnimation();
+    controller_->StartLockAnimation(false);
   else
     controller_->CancelLockWithOtherAnimation();
 }
 
 }  // namespace ash