diff options
| author | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 23:42:03 +0000 |
|---|---|---|
| committer | rkc@chromium.org <rkc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 23:42:03 +0000 |
| commit | a0f98edff771174fae980b52243edc2b5236c2ac (patch) | |
| tree | 79d66e6f4f26c969edf2517edfeb9a16cc85147a | |
| parent | c9f6f1ac15f4ed6901f4c58b364b6454ea56e54d (diff) | |
| download | chromium_src-a0f98edff771174fae980b52243edc2b5236c2ac.zip chromium_src-a0f98edff771174fae980b52243edc2b5236c2ac.tar.gz chromium_src-a0f98edff771174fae980b52243edc2b5236c2ac.tar.bz2 | |
Revert 134233 - 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/10221013
TBR=rkc@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10137014
git-svn-id: svn://svn.chromium.org/chrome/branches/1084/src@134397 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/ui/idle_logout_dialog_view.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc index 08466ea..9983952 100644 --- a/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc +++ b/chrome/browser/chromeos/ui/idle_logout_dialog_view.cc @@ -8,8 +8,6 @@ #include "base/bind_helpers.h" #include "base/time.h" #include "base/string_number_conversions.h" -#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h" -#include "chrome/browser/chromeos/dbus/session_manager_client.h" #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" #include "chrome/browser/ui/browser_list.h" #include "grit/browser_resources.h" |