Index: chrome/browser/chromeos/settings/device_settings_provider.h |
diff --git a/chrome/browser/chromeos/settings/device_settings_provider.h b/chrome/browser/chromeos/settings/device_settings_provider.h |
index c8b952e401211d14fc452bba65a7d5aa3337ff2b..b4aef5640893d3476610d8e0811656be76ba2e03 100644 |
--- a/chrome/browser/chromeos/settings/device_settings_provider.h |
+++ b/chrome/browser/chromeos/settings/device_settings_provider.h |
@@ -18,6 +18,7 @@ |
#include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h" |
#include "chrome/browser/chromeos/settings/device_settings_service.h" |
#include "chromeos/settings/cros_settings_provider.h" |
+#include "components/ownership/owner_settings_service.h" |
#include "components/policy/core/common/cloud/cloud_policy_constants.h" |
namespace base { |
@@ -31,8 +32,13 @@ class ChromeDeviceSettingsProto; |
namespace chromeos { |
// CrosSettingsProvider implementation that works with device settings. |
-class DeviceSettingsProvider : public CrosSettingsProvider, |
- public DeviceSettingsService::Observer { |
+// |
+// Note that the write path is in the process of being migrated to |
+// OwnerSettingsServiceChromeOS (crbug.com/230018). |
+class DeviceSettingsProvider |
+ : public CrosSettingsProvider, |
+ public DeviceSettingsService::Observer, |
+ public ownership::OwnerSettingsService::Observer { |
public: |
// The callback type that is called to get the device mode. |
typedef base::Callback<policy::DeviceMode(void)> GetDeviceModeCallback; |
@@ -59,6 +65,10 @@ class DeviceSettingsProvider : public CrosSettingsProvider, |
virtual void OwnershipStatusChanged() override; |
virtual void DeviceSettingsUpdated() override; |
+ // ownership::OwnerSettingsService::Observer implementation: |
+ virtual void OnTentativeChangesInPolicy( |
+ const enterprise_management::PolicyData& policy_data) override; |
+ |
// Populates in-memory cache from the local_state cache that is used to store |
// device settings before the device is owned and to speed up policy |
// availability before the policy blob is fetched on boot. |