diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 20:44:25 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-01 20:44:25 +0000 |
| commit | 1124720f4258ad21f49e0b08979c55d7013486dd (patch) | |
| tree | 73778d0ae2c019477cbcd10de4f379c3899cb4bd | |
| parent | ac110429b28e565989f38b78dfe8f4413beb8866 (diff) | |
| download | chromium_src-1124720f4258ad21f49e0b08979c55d7013486dd.zip chromium_src-1124720f4258ad21f49e0b08979c55d7013486dd.tar.gz chromium_src-1124720f4258ad21f49e0b08979c55d7013486dd.tar.bz2 | |
Change logout to use session manager instead of AttempUserExit.
This is a merge of https://chromiumcodereview.appspot.com/10220002/
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.
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=134053
Review URL: https://chromiumcodereview.appspot.com/10271038
git-svn-id: svn://svn.chromium.org/chrome/branches/1084/src@134769 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/ui/idle_logout_dialog_view.cc | 5 |
1 files changed, 4 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 9983952..1b461c9 100644 --- a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc +++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc @@ -9,6 +9,8 @@ #include "base/time.h" #include "base/string_number_conversions.h" #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" +#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" +#include "chrome/browser/chromeos/dbus/session_manager_client.h" #include "chrome/browser/ui/browser_list.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" @@ -188,6 +190,7 @@ void IdleLogoutDialogView::UpdateCountdownTimer() { IDS_IDLE_LOGOUT_WARNING_RESTART_NOW)); // Logout the current user. - BrowserList::AttemptUserExit(); + chromeos::DBusThreadManager::Get()-> + GetSessionManagerClient()->StopSession(); } } |