diff options
| author | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 12:54:24 +0000 |
|---|---|---|
| committer | nkostylev@chromium.org <nkostylev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-26 12:54:24 +0000 |
| commit | 10bd5876b87772c84d7feba090758e9950825c51 (patch) | |
| tree | f4247878c452034b6a9262e5fe824df39b9b1e79 | |
| parent | 6b1764927535af98fbc216c10dc1d26340160cf9 (diff) | |
| download | chromium_src-10bd5876b87772c84d7feba090758e9950825c51.zip chromium_src-10bd5876b87772c84d7feba090758e9950825c51.tar.gz chromium_src-10bd5876b87772c84d7feba090758e9950825c51.tar.bz2 | |
Merge 258366 "[cros] Increase lock UI show timeout for slow hard..."
> [cros] Increase lock UI show timeout for slow hardware
>
> BUG=350628
>
> Review URL: https://codereview.chromium.org/206483002
TBR=nkostylev@chromium.org
Review URL: https://codereview.chromium.org/212863003
git-svn-id: svn://svn.chromium.org/chrome/branches/1847/src@259562 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ash/wm/lock_state_controller.cc | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc index 3376c0d..2c74173 100644 --- a/ash/wm/lock_state_controller.cc +++ b/ash/wm/lock_state_controller.cc @@ -600,9 +600,22 @@ void LockStateController::PreLockAnimationFinished(bool request_lock) { delegate_->RequestLockScreen(); } + int lock_timeout = 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; + } +#endif + lock_fail_timer_.Start( FROM_HERE, - base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs), + base::TimeDelta::FromMilliseconds(lock_timeout), this, &LockStateController::OnLockFailTimeout); } |