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

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

Issue 11091023: ash : Decouple power button controller and session state controller. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix power button cancel behaviour + unittest 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
diff --git a/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc
similarity index 82%
rename from chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc
rename to chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc
index 24bd760a28916596eabe103b10d43ceaec4ca381..497320b7f9a79a8d60e944662f9a890f88074f6a 100644
--- a/chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.cc
+++ b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc
@@ -2,7 +2,7 @@
// 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/power_button_controller_delegate_chromeos.h"
+#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"
@@ -13,7 +13,7 @@
namespace chromeos {
-void PowerButtonControllerDelegateChromeos::RequestLockScreen() {
+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
@@ -26,7 +26,7 @@ void PowerButtonControllerDelegateChromeos::RequestLockScreen() {
DBusThreadManager::Get()->GetSessionManagerClient()->RequestLockScreen();
}
-void PowerButtonControllerDelegateChromeos::RequestShutdown() {
+void SessionStateControllerDelegateChromeos::RequestShutdown() {
DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown();
}

Powered by Google App Engine
This is Rietveld 408576698