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

Unified Diff: chrome/browser/chromeos/user_cros_settings_provider.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/user_cros_settings_provider.cc
diff --git a/chrome/browser/chromeos/user_cros_settings_provider.cc b/chrome/browser/chromeos/user_cros_settings_provider.cc
index f231a570587e54d06ceb813cee59a7092a25e9a6..eafbffbf8ce904352512fb0f7a1c42f4c69164e8 100644
--- a/chrome/browser/chromeos/user_cros_settings_provider.cc
+++ b/chrome/browser/chromeos/user_cros_settings_provider.cc
@@ -179,7 +179,8 @@ class UserCrosSettingsTrust : public SignedSettingsHelper::Callback {
PrefService* prefs = g_browser_process->local_state();
if (prefs->IsManagedPreference(name.c_str()))
return true;
- if (ownership_status == OwnershipService::OWNERSHIP_TAKEN) {
+ if (ownership_status == OwnershipService::OWNERSHIP_USER ||
+ ownership_status == OwnershipService::OWNERSHIP_ENTERPRISE) {
DCHECK(g_browser_process);
PrefService* prefs = g_browser_process->local_state();
DCHECK(prefs);
@@ -276,8 +277,9 @@ class UserCrosSettingsTrust : public SignedSettingsHelper::Callback {
return;
}
- bool is_owned = ownership_service_->GetStatus(true) ==
- OwnershipService::OWNERSHIP_TAKEN;
+ OwnershipService::Status ownership = ownership_service_->GetStatus(true);
+ bool is_owned = (ownership == OwnershipService::OWNERSHIP_USER ||
+ ownership == OwnershipService::OWNERSHIP_ENTERPRISE);
PrefService* prefs = g_browser_process->local_state();
switch (code) {
case SignedSettings::SUCCESS:

Powered by Google App Engine
This is Rietveld 408576698