Decouple EventClientImpl and root window. Check containers on the same root window as focused windo…

ash/wm/power_button_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/wm/power_button_controller.h"
 
 #include "ash/ash_switches.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/session_state_animator.h"
 #include "base/command_line.h"
 #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 {
 
 // Amount of time that the power button needs to be held before we lock the
 // screen.
 const int kLockTimeoutMs = 400;
 
 // Amount of time that the power button needs to be held before we shut down.
 const int kShutdownTimeoutMs = 400;
@@ skipping 274 matching lines @@
   StartShutdownTimer();
 }
 
 void PowerButtonController::OnShutdownTimeout() {
   if (!shutting_down_)
     StartShutdownAnimationAndRequestShutdown();
 }
 
 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_CHROMEOS ifdef, but i think that
this class is completely unsafe to use on non-chrome-os builds, since i believe
that delegate_ will be null there (at least, the only
PowerButtonControllerDelegate implementation that i see is
PowerButtonControllerDelegateChromeos).

a better long-term solution might be a stub PowerButtonControllerDelegate that
we use on windows and chrome os builds when not running on devices that just
exits in response to RequestShutdown() calls.

(doesn't need to happen in this change, though.)

[oshima, 2012/10/08 17:52:59]

Chances are this class may not make sense at all on windows (is it possible to
intercept power button on windows?), although I'm not 100% sure. We may still
want
to keep it for debugging though.

[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 not create a ShellDelegate?

[oshima, 2012/10/08 17:52:59]

There are a few unittests that create Shell with NULL delegates. 
It's unlikely for these tests to hit this code, but other places in ash
assumes this can be NULL, so I'd like to do the same.

+      delegate->Exit();
+  }
+#endif
   delegate_->RequestShutdown();
 }
 
 void PowerButtonController::StartLockTimer() {
   animator_->ShowBlackLayer();
   animator_->StartAnimation(
       internal::SessionStateAnimator::NON_LOCK_SCREEN_CONTAINERS,
       internal::SessionStateAnimator::ANIMATION_SLOW_CLOSE);
   lock_timer_.Stop();
   lock_timer_.Start(FROM_HERE,
@@ skipping 40 matching lines @@
   }
 
   real_shutdown_timer_.Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(
           kFastCloseAnimMs + kShutdownRequestDelayMs),
       this, &PowerButtonController::OnRealShutdownTimeout);
 }
 
 }  // namespace ash