chrome/browser/chromeos/system/ash_system_tray_delegate.cc - Issue 10825191: Allow closing root window, or pressing the power button to shutdown ash_shell, and chrome /w chrome…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

Issue 10825191: Allow closing root window, or pressing the power button to shutdown ash_shell, and chrome /w chrome… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: braces Created 8 years, 4 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

Index: chrome/browser/chromeos/system/ash_system_tray_delegate.cc

diff --git a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

index 1facfa46eceea9bc27e232d66ff05d3389eb93dd..7dab2d642ddbf27d616cc0eb7dc4ca7ad7a37d5a 100644

--- a/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

+++ b/chrome/browser/chromeos/system/ash_system_tray_delegate.cc

@@ -376,6 +376,8 @@ class SystemTrayDelegate : public ash::SystemTrayDelegate,

virtual void ShutDown() OVERRIDE {

DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();

+ if (!base::chromeos::IsRunningOnChromeOS())

+ browser::AttemptUserExit();

Daniel Erat 2012/08/07 23:35:17 nit: Wondering if it'd be cleaner to implement thi

}

virtual void SignOut() OVERRIDE {

« ash/wm/power_button_controller.cc ('K') | « ash/wm/power_button_controller.cc ('k') | no next file » | no next file with comments »