| Index: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
|
| index 3d98421a3b595caada20b4d952cb9fdc76770617..6b5b3cc4c584157c03be661fa5642bd2d29c9b44 100644
|
| --- a/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
|
| +++ b/chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc
|
| @@ -247,7 +247,7 @@
|
| return install_attributes_ && install_attributes_->IsEnterpriseDevice();
|
| }
|
|
|
| -std::string BrowserPolicyConnectorChromeOS::GetEnterpriseDomain() const {
|
| +std::string BrowserPolicyConnectorChromeOS::GetEnterpriseDomain() {
|
| return install_attributes_ ? install_attributes_->GetDomain() : std::string();
|
| }
|
|
|
| @@ -380,18 +380,4 @@
|
| device_cloud_policy_initializer_->Init();
|
| }
|
|
|
| -chromeos::AffiliationIDSet
|
| -BrowserPolicyConnectorChromeOS::GetDeviceAffiliationIDs() const {
|
| - chromeos::AffiliationIDSet affiliation_ids;
|
| - if (device_cloud_policy_manager_) {
|
| - const enterprise_management::PolicyData* const policy_data =
|
| - device_cloud_policy_manager_->device_store()->policy();
|
| - if (policy_data) {
|
| - affiliation_ids.insert(policy_data->device_affiliation_ids().begin(),
|
| - policy_data->device_affiliation_ids().end());
|
| - }
|
| - }
|
| - return affiliation_ids;
|
| -}
|
| -
|
| } // namespace policy
|
|
|