Index: chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h |
diff --git a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h |
index f1394b4d42dea08ada001c382d492b1448e27faf..b6ae936c41fe8009ac4476627a2c3f427f2f0b3f 100644 |
--- a/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h |
+++ b/chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h |
@@ -34,6 +34,7 @@ class OwnerKeyUtil; |
namespace chromeos { |
+class CrosSettings; |
class FakeOwnerSettingsService; |
// The class is a profile-keyed service which holds public/private |
@@ -121,6 +122,7 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService, |
protected: |
OwnerSettingsServiceChromeOS( |
DeviceSettingsService* device_settings_service, |
+ CrosSettings* cros_settings, |
Profile* profile, |
const scoped_refptr<ownership::OwnerKeyUtil>& owner_key_util); |
@@ -138,6 +140,10 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService, |
// Possibly notifies DeviceSettingsService that owner's keypair is loaded. |
void OnPostKeypairLoadedActions() override; |
+ // Once trusted settings are loaded, ensures that the Owner's user_id_ is |
+ // on the user account whitelist. |
+ void FixupLocalOwnerPolicy(); |
+ |
// Tries to apply recent changes to device settings proto, sign it and store. |
void StorePendingChanges(); |
@@ -156,6 +162,8 @@ class OwnerSettingsServiceChromeOS : public ownership::OwnerSettingsService, |
DeviceSettingsService* device_settings_service_; |
+ CrosSettings* cros_settings_; |
+ |
// Profile this service instance belongs to. |
Profile* profile_; |