| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/wm/lock_state_controller.h" | 5 #include "ash/wm/lock_state_controller.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "ash/accessibility_delegate.h" | 10 #include "ash/accessibility_delegate.h" |
| (...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 486 UMA_ACCEL_LOCK_SCREEN_LOCK_BUTTON); | 486 UMA_ACCEL_LOCK_SCREEN_LOCK_BUTTON); |
| 487 delegate_->RequestLockScreen(); | 487 delegate_->RequestLockScreen(); |
| 488 } | 488 } |
| 489 | 489 |
| 490 base::TimeDelta timeout = | 490 base::TimeDelta timeout = |
| 491 base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs); | 491 base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs); |
| 492 #if defined(OS_CHROMEOS) | 492 #if defined(OS_CHROMEOS) |
| 493 // Increase lock timeout for slower hardware, see http://crbug.com/350628 | 493 // Increase lock timeout for slower hardware, see http://crbug.com/350628 |
| 494 const std::string board = base::SysInfo::GetLsbReleaseBoard(); | 494 const std::string board = base::SysInfo::GetLsbReleaseBoard(); |
| 495 if (board == "x86-mario" || | 495 if (board == "x86-mario" || |
| 496 base::StartsWithASCII(board, "x86-alex", true /* case_sensitive */) || | 496 base::StartsWith(board, "x86-alex", base::CompareCase::SENSITIVE) || |
| 497 base::StartsWithASCII(board, "x86-zgb", true /* case_sensitive */) || | 497 base::StartsWith(board, "x86-zgb", base::CompareCase::SENSITIVE) || |
| 498 base::StartsWithASCII(board, "daisy", true /* case_sensitive */)) { | 498 base::StartsWith(board, "daisy", base::CompareCase::SENSITIVE)) { |
| 499 timeout *= 2; | 499 timeout *= 2; |
| 500 } | 500 } |
| 501 // Times out on ASAN bots. | 501 // Times out on ASAN bots. |
| 502 #if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) | 502 #if defined(MEMORY_SANITIZER) || defined(ADDRESS_SANITIZER) |
| 503 timeout *= 2; | 503 timeout *= 2; |
| 504 #endif | 504 #endif |
| 505 #endif | 505 #endif |
| 506 lock_fail_timer_.Start( | 506 lock_fail_timer_.Start( |
| 507 FROM_HERE, timeout, this, &LockStateController::OnLockFailTimeout); | 507 FROM_HERE, timeout, this, &LockStateController::OnLockFailTimeout); |
| 508 } | 508 } |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 573 if (unlocked_properties_.get() && | 573 if (unlocked_properties_.get() && |
| 574 unlocked_properties_->background_is_hidden) { | 574 unlocked_properties_->background_is_hidden) { |
| 575 animation_sequence->StartAnimation( | 575 animation_sequence->StartAnimation( |
| 576 SessionStateAnimator::DESKTOP_BACKGROUND, | 576 SessionStateAnimator::DESKTOP_BACKGROUND, |
| 577 SessionStateAnimator::ANIMATION_FADE_OUT, | 577 SessionStateAnimator::ANIMATION_FADE_OUT, |
| 578 speed); | 578 speed); |
| 579 } | 579 } |
| 580 } | 580 } |
| 581 | 581 |
| 582 } // namespace ash | 582 } // namespace ash |
| OLD | NEW |