| Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
|
| diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
|
| index 608a718aa0404f079cba91a6cc76f374381ca3ac..c708998051606478e508da9515372eb6b5c7b08f 100644
|
| --- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
|
| +++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h
|
| @@ -39,6 +39,7 @@ class AffiliatedCloudPolicyInvalidator;
|
| class AffiliatedInvalidationServiceProvider;
|
| class AffiliatedRemoteCommandsInvalidator;
|
| class BluetoothPolicyHandler;
|
| +class DeviceActiveDirectoryPolicyManager;
|
| class DeviceCloudPolicyInitializer;
|
| class DeviceLocalAccountPolicyService;
|
| class DeviceManagementService;
|
| @@ -75,6 +76,8 @@ class BrowserPolicyConnectorChromeOS
|
| // Returns the enterprise domain if device is managed.
|
| std::string GetEnterpriseDomain() const;
|
|
|
| + // Returns the Kerberos realm (aka Windows Domain) if the device is managed by
|
| + // Active Directory.
|
| std::string GetRealm() const;
|
|
|
| // Returns the device asset ID if it is set.
|
| @@ -94,14 +97,23 @@ class BrowserPolicyConnectorChromeOS
|
| // for details.
|
| EnrollmentConfig GetPrescribedEnrollmentConfig() const;
|
|
|
| + // May be nullptr, e.g. for devices managed by Active Directory.
|
| DeviceCloudPolicyManagerChromeOS* GetDeviceCloudPolicyManager() const {
|
| return device_cloud_policy_manager_;
|
| }
|
|
|
| + // May be nullptr, e.g. for cloud-managed devices.
|
| + DeviceActiveDirectoryPolicyManager* GetDeviceActiveDirectoryPolicyManager()
|
| + const {
|
| + return device_active_directory_policy_manager_;
|
| + }
|
| +
|
| + // May be nullptr, e.g. for devices managed by Active Directory.
|
| DeviceCloudPolicyInitializer* GetDeviceCloudPolicyInitializer() const {
|
| return device_cloud_policy_initializer_.get();
|
| }
|
|
|
| + // May be nullptr, e.g. for devices managed by Active Directory.
|
| DeviceLocalAccountPolicyService* GetDeviceLocalAccountPolicyService() const {
|
| return device_local_account_policy_service_.get();
|
| }
|
| @@ -110,6 +122,7 @@ class BrowserPolicyConnectorChromeOS
|
| return install_attributes_.get();
|
| }
|
|
|
| + // May be nullptr, e.g. for devices managed by Active Directory.
|
| ServerBackedStateKeysBroker* GetStateKeysBroker() const {
|
| return state_keys_broker_.get();
|
| }
|
| @@ -163,8 +176,10 @@ class BrowserPolicyConnectorChromeOS
|
| std::unique_ptr<chromeos::InstallAttributes> install_attributes_;
|
| std::unique_ptr<AffiliatedInvalidationServiceProvider>
|
| affiliated_invalidation_service_provider_;
|
| - DeviceCloudPolicyManagerChromeOS* device_cloud_policy_manager_;
|
| - PrefService* local_state_;
|
| + DeviceCloudPolicyManagerChromeOS* device_cloud_policy_manager_ = nullptr;
|
| + DeviceActiveDirectoryPolicyManager* device_active_directory_policy_manager_ =
|
| + nullptr;
|
| + PrefService* local_state_ = nullptr;
|
| std::unique_ptr<DeviceCloudPolicyInitializer>
|
| device_cloud_policy_initializer_;
|
| std::unique_ptr<DeviceLocalAccountPolicyService>
|
| @@ -182,7 +197,7 @@ class BrowserPolicyConnectorChromeOS
|
| // after login.
|
| // The provider is owned by the base class; this field is just a typed weak
|
| // pointer to get to the ProxyPolicyProvider at SetUserPolicyDelegate().
|
| - ProxyPolicyProvider* global_user_cloud_policy_provider_;
|
| + ProxyPolicyProvider* global_user_cloud_policy_provider_ = nullptr;
|
|
|
| std::unique_ptr<NetworkConfigurationUpdater> network_configuration_updater_;
|
|
|
|
|