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

Unified Diff: chrome/browser/chromeos/login/signed_settings.cc

Issue 6821075: Chrome-side lockbox bindings (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: CL RC1. Created 9 years, 8 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/login/signed_settings.cc
diff --git a/chrome/browser/chromeos/login/signed_settings.cc b/chrome/browser/chromeos/login/signed_settings.cc
index 6e90a9308f1e779d68c833abdb6e58ec79bccb11..46677e1faa2a14a6f9758d989092202f5a460f2b 100644
--- a/chrome/browser/chromeos/login/signed_settings.cc
+++ b/chrome/browser/chromeos/login/signed_settings.cc
@@ -323,7 +323,8 @@ StorePropertyOp::StorePropertyOp(const std::string& name,
StorePropertyOp::~StorePropertyOp() {}
void StorePropertyOp::Execute() {
- if (service_->GetStatus(true) != OwnershipService::OWNERSHIP_TAKEN) {
+ if (service_->GetStatus(true) != OwnershipService::OWNERSHIP_USER &&
+ service_->GetStatus(true) != OwnershipService::OWNERSHIP_ENTERPRISE) {
if (g_browser_process &&
g_browser_process->local_state() &&
SignedSettingsTempStorage::Store(name_, value_,
@@ -387,7 +388,8 @@ void RetrievePropertyOp::Execute() {
// device has been owned and before temp_storage settings are finally
// persisted into signed settings.
// In this lapse of time Retrieve loses access to those settings.
- if (service_->GetStatus(true) != OwnershipService::OWNERSHIP_TAKEN) {
+ if (service_->GetStatus(true) != OwnershipService::OWNERSHIP_USER &&
+ service_->GetStatus(true) != OwnershipService::OWNERSHIP_ENTERPRISE) {
if (g_browser_process &&
g_browser_process->local_state() &&
SignedSettingsTempStorage::Retrieve(

Powered by Google App Engine
This is Rietveld 408576698