diff options
| author | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 15:26:17 +0000 |
|---|---|---|
| committer | laforge@chromium.org <laforge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 15:26:17 +0000 |
| commit | eaa62193074034c95ffb275272c48374a12b9664 (patch) | |
| tree | 0b8ad59ae84a61c69a01dd1315971eed95795984 | |
| parent | 07269ad644313be8226aa2a9fe66872179d8a7bd (diff) | |
| download | chromium_src-eaa62193074034c95ffb275272c48374a12b9664.zip chromium_src-eaa62193074034c95ffb275272c48374a12b9664.tar.gz chromium_src-eaa62193074034c95ffb275272c48374a12b9664.tar.bz2 | |
Revert 134169 - Merge 134053 - Change idle logout dialog to use SessionManager::Stop.
To ensure we log out when the idle logout dialog's timer runs out, instead of AttemptUserExit, use SessionManager::Stop to end our session, forcefully if needed.
R=tbarzic@chromium.org
BUG=chromium-os:29176
TEST=Tested manually with the device counting down with the idle_logout dialog with crosh still open.
Review URL: https://chromiumcodereview.appspot.com/10220002
TBR=rkc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10246003
TBR=rkc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10252006
git-svn-id: svn://svn.chromium.org/chrome/branches/1084/src@134274 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/ui/idle_logout_dialog_view.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc index db589b9..08466ea 100644 --- a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc +++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc @@ -190,6 +190,6 @@ void IdleLogoutDialogView::UpdateCountdownTimer() { IDS_IDLE_LOGOUT_WARNING_RESTART_NOW)); // Logout the current user. - DBusThreadManager::Get()->GetSessionManagerClient()->StopSession(); + BrowserList::AttemptUserExit(); } } |