Index: ash/wm/lock_state_controller.cc |
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc |
index 5842f1706c5083ff5492aaf7dceb4902af91372d..4f759fdb933333cf36ae9f25120da6362e0a7851 100644 |
--- a/ash/wm/lock_state_controller.cc |
+++ b/ash/wm/lock_state_controller.cc |
@@ -488,11 +488,10 @@ void LockStateController::PreLockAnimationFinished(bool request_lock) { |
base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs); |
#if defined(OS_CHROMEOS) |
// Increase lock timeout for slower hardware, see http://crbug.com/350628 |
- const std::string board = base::SysInfo::GetLsbReleaseBoard(); |
- if (board == "x86-mario" || |
+ const std::string board = base::SysInfo::GetStrippedReleaseBoard(); |
+ if (board == "x86-mario" || board == "daisy" || |
Thiemo Nagel
2016/11/25 15:16:12
Add a comment why mario and daisy are handled diff
igorcov
2016/11/28 12:09:49
Done, thanks everyone for digging this up.
|
base::StartsWith(board, "x86-alex", base::CompareCase::SENSITIVE) || |
- base::StartsWith(board, "x86-zgb", base::CompareCase::SENSITIVE) || |
- base::StartsWith(board, "daisy", base::CompareCase::SENSITIVE)) { |
+ base::StartsWith(board, "x86-zgb", base::CompareCase::SENSITIVE)) { |
timeout *= 2; |
} |
#endif |