Revert 160696 - Decouple EventClientImpl and root window. Check containers on the same root window …

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)
-  if (!base::chromeos::IsRunningOnChromeOS()) {
-    ShellDelegate* delegate = Shell::GetInstance()->delegate();
-    if (delegate)
-      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