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

Unified Diff: chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc

Issue 11185006: Revert 162140 - ash : Decouple power button controller and session state controller. (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
Index: chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc
===================================================================
--- chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc (revision 162199)
+++ chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc (working copy)
@@ -1,33 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h"
-
-#include "base/logging.h"
-#include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
-#include "chrome/browser/lifetime/application_lifetime.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/power_manager_client.h"
-#include "chromeos/dbus/session_manager_client.h"
-
-namespace chromeos {
-
-void SessionStateControllerDelegateChromeos::RequestLockScreen() {
- // If KioskMode is enabled, if the user attempts to lock the screen via
- // the power button, we instead want to log the user out. This seemed to
- // be the most acceptable replacement for the lock action of the power
- // button for Kiosk mode users.
- if (KioskModeSettings::Get()->IsKioskModeEnabled()) {
- browser::AttemptUserExit();
- return;
- }
-
- DBusThreadManager::Get()->GetSessionManagerClient()->RequestLockScreen();
-}
-
-void SessionStateControllerDelegateChromeos::RequestShutdown() {
- DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();
-}
-
-} // namespace chromeos

Powered by Google App Engine
This is Rietveld 408576698