| Index: ash/wm/power_button_controller.cc
|
| ===================================================================
|
| --- ash/wm/power_button_controller.cc (revision 160706)
|
| +++ ash/wm/power_button_controller.cc (working copy)
|
| @@ -13,10 +13,6 @@
|
| #include "ui/aura/root_window.h"
|
| #include "ui/aura/shared/compound_event_filter.h"
|
|
|
| -#if defined(OS_CHROMEOS)
|
| -#include "base/chromeos/chromeos_version.h"
|
| -#endif
|
| -
|
| namespace ash {
|
|
|
| namespace {
|
| @@ -311,13 +307,6 @@
|
|
|
| void PowerButtonController::OnRealShutdownTimeout() {
|
| DCHECK(shutting_down_);
|
| -#if defined(OS_CHROMEOS)
|
| - if (!base::chromeos::IsRunningOnChromeOS()) {
|
| - ShellDelegate* delegate = Shell::GetInstance()->delegate();
|
| - if (delegate)
|
| - delegate->Exit();
|
| - }
|
| -#endif
|
| delegate_->RequestShutdown();
|
| }
|
|
|
|
|