Chromium Code Reviews| Index: chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc |
| diff --git a/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc |
| index a4cc4bde7812cbe2939eded1be37488b5f73dc17..a1d5e0c697e90b866932394494177be9a194eb9d 100644 |
| --- a/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc |
| +++ b/chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.cc |
| @@ -5,23 +5,46 @@ |
| #include "chrome/browser/chromeos/power/session_state_controller_delegate_chromeos.h" |
| #include "base/logging.h" |
| +#include "chrome/browser/chromeos/settings/cros_settings.h" |
| #include "chromeos/dbus/dbus_thread_manager.h" |
| #include "chromeos/dbus/power_manager_client.h" |
| #include "chromeos/dbus/session_manager_client.h" |
| +#include "chromeos/settings/cros_settings_names.h" |
| +#include "chromeos/settings/cros_settings_provider.h" |
| namespace chromeos { |
| +SessionStateControllerDelegateChromeos::SessionStateControllerDelegateChromeos() |
| + : weak_factory_(this) { |
| +} |
| + |
| +SessionStateControllerDelegateChromeos:: |
| + ~SessionStateControllerDelegateChromeos() { |
| +} |
| + |
| void SessionStateControllerDelegateChromeos::RequestLockScreen() { |
| // TODO(antrim) : additional logging for crbug/173178 |
| LOG(WARNING) << "Requesting screen lock from SessionStateControllerDelegate"; |
| DBusThreadManager::Get()->GetSessionManagerClient()->RequestLockScreen(); |
| } |
| -void SessionStateControllerDelegateChromeos::RequestRestart() { |
| - DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart(); |
| -} |
| +void SessionStateControllerDelegateChromeos::RequestShutdownOrRestart() { |
| + CrosSettings* cros_settings = CrosSettings::Get(); |
| + CrosSettingsProvider::TrustedStatus status = |
| + cros_settings->PrepareTrustedValues(base::Bind( |
| + &SessionStateControllerDelegateChromeos::RequestShutdownOrRestart, |
| + weak_factory_.GetWeakPtr())); |
| + if (status != CrosSettingsProvider::TRUSTED) |
| + return; |
| + |
| + // Get the updated policy. |
| + bool reboot_on_shutdown = false; |
| + cros_settings->GetBoolean(kRebootOnShutdown, &reboot_on_shutdown); |
| -void SessionStateControllerDelegateChromeos::RequestShutdown() { |
| + if (reboot_on_shutdown) { |
|
Daniel Erat
2015/01/07 16:18:40
nit: it's a line shorter to do:
if (reboot_on_s
cschuet (SLOW)
2015/01/13 10:38:28
Done.
|
| + DBusThreadManager::Get()->GetPowerManagerClient()->RequestRestart(); |
| + return; |
| + } |
| DBusThreadManager::Get()->GetPowerManagerClient()->RequestShutdown(); |
| } |