| Index: ash/wm/lock_state_controller_impl2.cc
|
| diff --git a/ash/wm/lock_state_controller_impl2.cc b/ash/wm/lock_state_controller_impl2.cc
|
| index c5301b7409986fedc22c1a84d6a6d04dee8fbc07..dae62c4a0cd3bf455867ca49b2a3b0208de0b792 100644
|
| --- a/ash/wm/lock_state_controller_impl2.cc
|
| +++ b/ash/wm/lock_state_controller_impl2.cc
|
| @@ -12,16 +12,13 @@
|
| #include "ash/wm/session_state_animator.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/command_line.h"
|
| +#include "base/sys_info.h"
|
| #include "base/timer/timer.h"
|
| #include "ui/aura/root_window.h"
|
| #include "ui/compositor/layer_animation_sequence.h"
|
| #include "ui/compositor/scoped_layer_animation_settings.h"
|
| #include "ui/views/corewm/compound_event_filter.h"
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#include "base/chromeos/chromeos_version.h"
|
| -#endif
|
| -
|
| namespace ash {
|
|
|
| namespace {
|
| @@ -369,7 +366,7 @@ void LockStateControllerImpl2::StartRealShutdownTimer(
|
| void LockStateControllerImpl2::OnRealShutdownTimeout() {
|
| DCHECK(shutting_down_);
|
| #if defined(OS_CHROMEOS)
|
| - if (!base::chromeos::IsRunningOnChromeOS()) {
|
| + if (!base::SysInfo::IsRunningOnChromeOS()) {
|
| ShellDelegate* delegate = Shell::GetInstance()->delegate();
|
| if (delegate) {
|
| delegate->Exit();
|
|
|