| Index: ash/wm/session_state_controller_impl.cc
|
| diff --git a/ash/wm/session_state_controller_impl.cc b/ash/wm/session_state_controller_impl.cc
|
| index dbd97a7b75c173f2c0974bfc34621e2ed4ed94de..63b0d1fe8a9111712be71be8621b508c63b5a832 100644
|
| --- a/ash/wm/session_state_controller_impl.cc
|
| +++ b/ash/wm/session_state_controller_impl.cc
|
| @@ -11,13 +11,10 @@
|
| #include "ash/shell_window_ids.h"
|
| #include "ash/wm/session_state_animator.h"
|
| #include "base/command_line.h"
|
| +#include "base/sys_info.h"
|
| #include "ui/aura/root_window.h"
|
| #include "ui/views/corewm/compound_event_filter.h"
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#include "base/chromeos/chromeos_version.h"
|
| -#endif
|
| -
|
| namespace ash {
|
|
|
| SessionStateControllerImpl::TestApi::TestApi(
|
| @@ -321,7 +318,7 @@ void SessionStateControllerImpl::StartRealShutdownTimer() {
|
| void SessionStateControllerImpl::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();
|
|
|