Index: ash/wm/power_button_controller.cc |
diff --git a/ash/wm/power_button_controller.cc b/ash/wm/power_button_controller.cc |
index bd9bb911ac2c52702eb5dd1e700912104aebae51..4f05f1b14d2f4c440145e6d2c8853e2e0ff055a5 100644 |
--- a/ash/wm/power_button_controller.cc |
+++ b/ash/wm/power_button_controller.cc |
@@ -13,6 +13,10 @@ |
#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 { |
@@ -307,6 +311,13 @@ void PowerButtonController::OnShutdownTimeout() { |
void PowerButtonController::OnRealShutdownTimeout() { |
DCHECK(shutting_down_); |
+#if defined(OS_CHROMEOS) |
Daniel Erat
2012/10/08 14:41:51
this code seems a bit strange. you have an OS_CHR
oshima
2012/10/08 17:52:59
Chances are this class may not make sense at all o
Daniel Erat
2012/10/08 18:24:25
Yeah, I was just suggesting this for debugging.
|
+ if (!base::chromeos::IsRunningOnChromeOS()) { |
+ ShellDelegate* delegate = Shell::GetInstance()->delegate(); |
+ if (delegate) |
Daniel Erat
2012/10/08 14:41:51
random question: under what circumstances do we no
oshima
2012/10/08 17:52:59
There are a few unittests that create Shell with N
|
+ delegate->Exit(); |
+ } |
+#endif |
delegate_->RequestShutdown(); |
} |