diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-08 18:12:20 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-08 18:12:20 +0000 |
| commit | 972efca947e936651a13ebb64f23fd00cbf0b3bd (patch) | |
| tree | 72a51669594837c529b4b948585ef8796089d4a4 /ash/wm | |
| parent | 9c57d0de2275b7330b989586578bb30db8164f20 (diff) | |
| download | chromium_src-972efca947e936651a13ebb64f23fd00cbf0b3bd.zip chromium_src-972efca947e936651a13ebb64f23fd00cbf0b3bd.tar.gz chromium_src-972efca947e936651a13ebb64f23fd00cbf0b3bd.tar.bz2 | |
ash: Increase lock-fail timeout from 4 sec to 8 sec.
I've seen this timeout get reached occasionally on slower
machines. The lock screen typically shows up soon
afterwards, so this results in ugly jank (the lock animation
is performed, an empty desktop is shown for four seconds,
the browser windows briefly reappear, and then they get
hidden again after the lock screen is ready).
The timeout is mostly just an artifact of the old design
where a separate window manager displayed the animation and
waited for Chrome to lock the screen, incidentally. I'm not
sure whether we really need it at all anymore.
BUG=none
Review URL: https://chromiumcodereview.appspot.com/18452004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
| -rw-r--r-- | ash/wm/lock_state_controller.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc index 4632070..3b3d1cf 100644 --- a/ash/wm/lock_state_controller.cc +++ b/ash/wm/lock_state_controller.cc @@ -17,7 +17,7 @@ namespace ash { const int LockStateController::kLockTimeoutMs = 400; const int LockStateController::kShutdownTimeoutMs = 400; -const int LockStateController::kLockFailTimeoutMs = 4000; +const int LockStateController::kLockFailTimeoutMs = 8000; const int LockStateController::kLockToShutdownTimeoutMs = 150; const int LockStateController::kShutdownRequestDelayMs = 50; |