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

Unified Diff: chromeos/dbus/power_policy_controller.cc

Issue 2912763003: cros: Prevent shut down on lid-close during migration. (Closed)
Patch Set: revert unrelated change Created 3 years, 7 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
« no previous file with comments | « chromeos/dbus/power_policy_controller.h ('k') | chromeos/dbus/power_policy_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/dbus/power_policy_controller.cc
diff --git a/chromeos/dbus/power_policy_controller.cc b/chromeos/dbus/power_policy_controller.cc
index 783d17fb3e636d76b77b95fa5a243f6160514e1a..1996e2f88c2dd314028187d8a2e9ec8e48e49490 100644
--- a/chromeos/dbus/power_policy_controller.cc
+++ b/chromeos/dbus/power_policy_controller.cc
@@ -276,12 +276,21 @@ void PowerPolicyController::NotifyChromeIsExiting() {
SendCurrentPolicy();
}
+void PowerPolicyController::SetEncryptionMigrationActive(bool active) {
+ if (encryption_migration_active_ == active)
+ return;
+
+ encryption_migration_active_ = active;
+ SendCurrentPolicy();
+}
+
PowerPolicyController::PowerPolicyController(PowerManagerClient* client)
: client_(client),
prefs_were_set_(false),
honor_screen_wake_locks_(true),
next_wake_lock_id_(1),
- chrome_is_exiting_(false) {
+ chrome_is_exiting_(false),
+ encryption_migration_active_(false) {
DCHECK(client_);
client_->AddObserver(this);
}
@@ -367,6 +376,15 @@ void PowerPolicyController::SendCurrentPolicy() {
}
}
+ if (encryption_migration_active_ &&
+ policy.lid_closed_action() !=
+ power_manager::PowerManagementPolicy_Action_DO_NOTHING) {
+ policy.set_lid_closed_action(
+ power_manager::PowerManagementPolicy_Action_SUSPEND);
+ causes +=
+ std::string((causes.empty() ? "" : ", ")) + "encryption migration";
+ }
+
// To avoid a race in the case where the user asks Chrome to sign out
// and then immediately closes the lid, override the lid-closed action
// so the system will stay awake while Chrome is exiting. When Chrome
« no previous file with comments | « chromeos/dbus/power_policy_controller.h ('k') | chromeos/dbus/power_policy_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698