| 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 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 481 chromeos::DBusThreadManager::Get() | 481 chromeos::DBusThreadManager::Get() |
| 482 ->GetSessionManagerClient() | 482 ->GetSessionManagerClient() |
| 483 ->RequestLockScreen(); | 483 ->RequestLockScreen(); |
| 484 #endif | 484 #endif |
| 485 } | 485 } |
| 486 | 486 |
| 487 base::TimeDelta timeout = | 487 base::TimeDelta timeout = |
| 488 base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs); | 488 base::TimeDelta::FromMilliseconds(kLockFailTimeoutMs); |
| 489 #if defined(OS_CHROMEOS) | 489 #if defined(OS_CHROMEOS) |
| 490 // Increase lock timeout for slower hardware, see http://crbug.com/350628 | 490 // Increase lock timeout for slower hardware, see http://crbug.com/350628 |
| 491 const std::string board = base::SysInfo::GetLsbReleaseBoard(); | 491 const std::string board = base::SysInfo::GetStrippedReleaseBoard(); |
| 492 if (board == "x86-mario" || | 492 if (board == "x86-mario" || |
| 493 base::StartsWith(board, "x86-alex", base::CompareCase::SENSITIVE) || | 493 base::StartsWith(board, "x86-alex", base::CompareCase::SENSITIVE) || |
| 494 base::StartsWith(board, "x86-zgb", base::CompareCase::SENSITIVE) || | 494 base::StartsWith(board, "x86-zgb", base::CompareCase::SENSITIVE) || |
| 495 base::StartsWith(board, "daisy", base::CompareCase::SENSITIVE)) { | 495 base::StartsWith(board, "daisy", base::CompareCase::SENSITIVE)) { |
| 496 timeout *= 2; | 496 timeout *= 2; |
| 497 } | 497 } |
| 498 #endif | 498 #endif |
| 499 lock_fail_timer_.Start(FROM_HERE, timeout, this, | 499 lock_fail_timer_.Start(FROM_HERE, timeout, this, |
| 500 &LockStateController::OnLockFailTimeout); | 500 &LockStateController::OnLockFailTimeout); |
| 501 | 501 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 SessionStateAnimator::AnimationSpeed speed, | 563 SessionStateAnimator::AnimationSpeed speed, |
| 564 SessionStateAnimator::AnimationSequence* animation_sequence) { | 564 SessionStateAnimator::AnimationSequence* animation_sequence) { |
| 565 if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) { | 565 if (unlocked_properties_.get() && unlocked_properties_->wallpaper_is_hidden) { |
| 566 animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER, | 566 animation_sequence->StartAnimation(SessionStateAnimator::WALLPAPER, |
| 567 SessionStateAnimator::ANIMATION_FADE_OUT, | 567 SessionStateAnimator::ANIMATION_FADE_OUT, |
| 568 speed); | 568 speed); |
| 569 } | 569 } |
| 570 } | 570 } |
| 571 | 571 |
| 572 } // namespace ash | 572 } // namespace ash |
| OLD | NEW |