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

Unified Diff: chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc

Issue 690643002: Add RESTORE_MODE_DISABLED to RestoreMode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed comment. Created 6 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/policy/device_cloud_policy_initializer.cc
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
index 2373c048f0d9745e722a3c4f59cd8b9335063c56..a63cf76a1982a79255fe2361f228dedbcb62e7d7 100644
--- a/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_initializer.cc
@@ -135,9 +135,9 @@ void DeviceCloudPolicyInitializer::StartEnrollment(
}
bool DeviceCloudPolicyInitializer::ShouldAutoStartEnrollment() const {
- std::string restore_mode = GetRestoreMode();
- if (restore_mode == kDeviceStateRestoreModeReEnrollmentRequested ||
- restore_mode == kDeviceStateRestoreModeReEnrollmentEnforced) {
+ const RestoreMode restore_mode = GetRestoreMode();
+ if (restore_mode == RESTORE_MODE_REENROLLMENT_REQUESTED ||
+ restore_mode == RESTORE_MODE_REENROLLMENT_ENFORCED) {
return true;
}
@@ -163,7 +163,7 @@ std::string DeviceCloudPolicyInitializer::GetEnrollmentRecoveryDomain() const {
}
bool DeviceCloudPolicyInitializer::CanExitEnrollment() const {
- if (GetRestoreMode() == kDeviceStateRestoreModeReEnrollmentEnforced)
+ if (GetRestoreMode() == RESTORE_MODE_REENROLLMENT_ENFORCED)
return false;
if (local_state_->HasPrefPath(prefs::kDeviceEnrollmentCanExit))
@@ -254,12 +254,4 @@ void DeviceCloudPolicyInitializer::StartConnection(
}
}
-std::string DeviceCloudPolicyInitializer::GetRestoreMode() const {
- const base::DictionaryValue* device_state_dict =
- local_state_->GetDictionary(prefs::kServerBackedDeviceState);
- std::string restore_mode;
- device_state_dict->GetString(kDeviceStateRestoreMode, &restore_mode);
- return restore_mode;
-}
-
} // namespace policy

Powered by Google App Engine
This is Rietveld 408576698