ash: Fix a screen-locking crash.

ash/wm/lock_state_controller.cc

 // Copyright 2013 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/lock_state_controller.h"
 
 #include <algorithm>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/ash_switches.h"
 #include "ash/cancel_mode.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/session_state_animator.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
+#include "base/strings/string_util.h"
 #include "base/timer/timer.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/wm/core/compound_event_filter.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
 #include "media/audio/sounds/sounds_manager.h"
@@ skipping 548 matching lines @@
       SessionStateAnimator::ANIMATION_SPEED_MOVE_WINDOWS, observer);
   observer->Unpause();
 }
 
 void LockStateController::LockAnimationCancelled() {
   can_cancel_lock_animation_ = false;
   RestoreUnlockedProperties();
 }
 
 void LockStateController::PreLockAnimationFinished(bool request_lock) {
+  VLOG(1) << "PreLockAnimationFinished";
   can_cancel_lock_animation_ = false;
-  VLOG(1) << "PreLockAnimationFinished";
+
   if (request_lock) {
+    DCHECK(!system_is_locked_) << "Got request to lock already-locked system "
+                               << "at completion of pre-lock animation";
     Shell::GetInstance()->metrics()->RecordUserMetricsAction(
         shutdown_after_lock_ ?
         UMA_ACCEL_LOCK_SCREEN_POWER_BUTTON :
         UMA_ACCEL_LOCK_SCREEN_LOCK_BUTTON);
     delegate_->RequestLockScreen();
   }
 
-  int lock_timeout = kLockFailTimeoutMs;
-
+  // Don't start the lock-fail timer if the screen was already locked while the
+  // animation was going.
+  if (!system_is_locked_) {

[stevenjb, 2014/08/01 23:23:56]

nit: Early exit

[Daniel Erat, 2014/08/01 23:52:06]

Done.

+    base::TimeDelta timeout =
+        base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs);
 #if defined(OS_CHROMEOS)
-  std::string board = base::SysInfo::GetLsbReleaseBoard();
-
-  // Increase lock timeout for slower hardware, see http://crbug.com/350628
-  if (board == "x86-mario" ||
-      board.substr(0, 8) == "x86-alex" ||
-      board.substr(0, 7) == "x86-zgb") {
-    lock_timeout *= 2;
+    // Increase lock timeout for slower hardware, see http://crbug.com/350628
+    const std::string board = base::SysInfo::GetLsbReleaseBoard();
+    if (board == "x86-mario" ||
+        StartsWithASCII(board, "x86-alex", true) ||
+        StartsWithASCII(board, "x86-zgb", true)) {

[stevenjb, 2014/08/01 23:23:56]

nit: what is "true"?

[Daniel Erat, 2014/08/01 23:52:06]

done (but just because it still fits without wrapping :-P)

+      timeout *= 2;
+    }
+#endif
+    lock_fail_timer_.Start(
+        FROM_HERE, timeout, this, &LockStateController::OnLockFailTimeout);
   }
-#endif
-
-  lock_fail_timer_.Start(
-      FROM_HERE,
-      base::TimeDelta::FromMilliseconds(lock_timeout),
-      this,
-      &LockStateController::OnLockFailTimeout);
 }
 
 void LockStateController::PostLockAnimationFinished() {
   animating_lock_ = false;
   VLOG(1) << "PostLockAnimationFinished";
   FOR_EACH_OBSERVER(LockStateObserver, observers_,
       OnLockStateEvent(LockStateObserver::EVENT_LOCK_ANIMATION_FINISHED));
   if (!lock_screen_displayed_callback_.is_null()) {
     lock_screen_displayed_callback_.Run();
     lock_screen_displayed_callback_.Reset();
@@ skipping 56 matching lines @@
       unlocked_properties_->background_is_hidden) {
     animator_->StartAnimationWithObserver(
         SessionStateAnimator::DESKTOP_BACKGROUND,
         SessionStateAnimator::ANIMATION_FADE_OUT,
         speed,
         observer);
   }
 }
 
 }  // namespace ash