Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(690)

Unified Diff: ash/wm/power_button_controller.cc

Issue 11087014: Revert 160696 - Decouple EventClientImpl and root window. Check containers on the same root window … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/event_client_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « ash/wm/event_client_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698