| Index: chrome/browser/policy/browser_policy_connector.cc
|
| diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
|
| index bb6a250db4c839c50a669977cfc864ef7c5ac106..af5f6ef4326e4313408663e01b1e556c39bc6562 100644
|
| --- a/chrome/browser/policy/browser_policy_connector.cc
|
| +++ b/chrome/browser/policy/browser_policy_connector.cc
|
| @@ -183,8 +183,11 @@ bool BrowserPolicyConnector::IsEnterpriseManaged() {
|
| EnterpriseInstallAttributes::LockResult
|
| BrowserPolicyConnector::LockDevice(const std::string& user) {
|
| #if defined(OS_CHROMEOS)
|
| - if (install_attributes_.get())
|
| - return install_attributes_->LockDevice(user);
|
| + if (install_attributes_.get()) {
|
| + return install_attributes_->LockDevice(user,
|
| + device_data_store_->device_mode(),
|
| + device_data_store_->device_id());
|
| + }
|
| #endif
|
|
|
| return EnterpriseInstallAttributes::LOCK_BACKEND_ERROR;
|
| @@ -216,6 +219,18 @@ std::string BrowserPolicyConnector::GetEnterpriseDomain() {
|
| return std::string();
|
| }
|
|
|
| +DeviceMode BrowserPolicyConnector::GetDeviceMode() {
|
| +#if defined(OS_CHROMEOS)
|
| + if (install_attributes_.get())
|
| + return install_attributes_->GetMode();
|
| + else
|
| + return DEVICE_MODE_UNKNOWN;
|
| +#endif
|
| +
|
| + // We only have the notion of "enterprise" device on ChromeOS for now.
|
| + return DEVICE_MODE_CONSUMER;
|
| +}
|
| +
|
| void BrowserPolicyConnector::ResetDevicePolicy() {
|
| #if defined(OS_CHROMEOS)
|
| if (device_cloud_policy_subsystem_.get())
|
| @@ -338,8 +353,7 @@ void BrowserPolicyConnector::RegisterForUserPolicy(
|
| }
|
| }
|
|
|
| -const CloudPolicyDataStore*
|
| - BrowserPolicyConnector::GetDeviceCloudPolicyDataStore() const {
|
| +CloudPolicyDataStore* BrowserPolicyConnector::GetDeviceCloudPolicyDataStore() {
|
| #if defined(OS_CHROMEOS)
|
| return device_data_store_.get();
|
| #else
|
| @@ -347,8 +361,7 @@ const CloudPolicyDataStore*
|
| #endif
|
| }
|
|
|
| -const CloudPolicyDataStore*
|
| - BrowserPolicyConnector::GetUserCloudPolicyDataStore() const {
|
| +CloudPolicyDataStore* BrowserPolicyConnector::GetUserCloudPolicyDataStore() {
|
| return user_data_store_.get();
|
| }
|
|
|
|
|