Chromium Code Reviews| 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..af71857f3ba65b6886860014618fed78c18a70da 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 DeviceADPolicyManager; |
| 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,22 @@ class BrowserPolicyConnectorChromeOS |
| // for details. |
| EnrollmentConfig GetPrescribedEnrollmentConfig() const; |
| + // May be nullptr, eg. for AD-managed devices. |
|
emaxx
2016/11/11 15:25:08
nit: I think either "eg" or "e.g." should be used.
Thiemo Nagel
2016/11/16 19:11:01
Good point, I wasn't aware of that! I guess I'm g
|
| DeviceCloudPolicyManagerChromeOS* GetDeviceCloudPolicyManager() const { |
| return device_cloud_policy_manager_; |
| } |
| + // May be nullptr, eg. for non-AD-managed devices. |
| + DeviceADPolicyManager* GetDeviceADPolicyManager() const { |
| + return device_ad_policy_manager_; |
| + } |
| + |
| + // May be nullptr. |
| DeviceCloudPolicyInitializer* GetDeviceCloudPolicyInitializer() const { |
| return device_cloud_policy_initializer_.get(); |
| } |
| + // May be nullptr, eg. for AD-managed devices. |
| DeviceLocalAccountPolicyService* GetDeviceLocalAccountPolicyService() const { |
| return device_local_account_policy_service_.get(); |
| } |
| @@ -110,6 +121,7 @@ class BrowserPolicyConnectorChromeOS |
| return install_attributes_.get(); |
| } |
| + // May be nullptr, eg. for AD-managed devices. |
| ServerBackedStateKeysBroker* GetStateKeysBroker() const { |
| return state_keys_broker_.get(); |
| } |
| @@ -163,7 +175,8 @@ class BrowserPolicyConnectorChromeOS |
| std::unique_ptr<chromeos::InstallAttributes> install_attributes_; |
| std::unique_ptr<AffiliatedInvalidationServiceProvider> |
| affiliated_invalidation_service_provider_; |
| - DeviceCloudPolicyManagerChromeOS* device_cloud_policy_manager_; |
| + DeviceCloudPolicyManagerChromeOS* device_cloud_policy_manager_ = nullptr; |
| + DeviceADPolicyManager* device_ad_policy_manager_ = nullptr; |
| PrefService* local_state_; |
| std::unique_ptr<DeviceCloudPolicyInitializer> |
| device_cloud_policy_initializer_; |
| @@ -182,7 +195,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_; |