Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(100)

Side by Side Diff: chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

Issue 2534433002: Mop up incorrect uses of IsEnterpriseManaged() (Closed)
Patch Set: Address Roman's comment Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" 5 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 if (device_cloud_policy_manager_) 218 if (device_cloud_policy_manager_)
219 device_cloud_policy_manager_->RemoveDeviceCloudPolicyManagerObserver(this); 219 device_cloud_policy_manager_->RemoveDeviceCloudPolicyManagerObserver(this);
220 220
221 ChromeBrowserPolicyConnector::Shutdown(); 221 ChromeBrowserPolicyConnector::Shutdown();
222 } 222 }
223 223
224 bool BrowserPolicyConnectorChromeOS::IsEnterpriseManaged() const { 224 bool BrowserPolicyConnectorChromeOS::IsEnterpriseManaged() const {
225 return install_attributes_ && install_attributes_->IsEnterpriseManaged(); 225 return install_attributes_ && install_attributes_->IsEnterpriseManaged();
226 } 226 }
227 227
228 bool BrowserPolicyConnectorChromeOS::IsCloudManaged() const {
229 return install_attributes_ && install_attributes_->IsCloudManaged();
230 }
231
232 bool BrowserPolicyConnectorChromeOS::IsActiveDirectoryManaged() const {
233 return install_attributes_ && install_attributes_->IsActiveDirectoryManaged();
234 }
235
228 std::string BrowserPolicyConnectorChromeOS::GetEnterpriseDomain() const { 236 std::string BrowserPolicyConnectorChromeOS::GetEnterpriseDomain() const {
229 return install_attributes_ ? install_attributes_->GetDomain() : std::string(); 237 return install_attributes_ ? install_attributes_->GetDomain() : std::string();
230 } 238 }
231 239
232 std::string BrowserPolicyConnectorChromeOS::GetRealm() const { 240 std::string BrowserPolicyConnectorChromeOS::GetRealm() const {
233 return install_attributes_ ? install_attributes_->GetRealm() : std::string(); 241 return install_attributes_ ? install_attributes_->GetRealm() : std::string();
234 } 242 }
235 243
236 std::string BrowserPolicyConnectorChromeOS::GetDeviceAssetID() const { 244 std::string BrowserPolicyConnectorChromeOS::GetDeviceAssetID() const {
237 if (device_cloud_policy_manager_) { 245 if (device_cloud_policy_manager_) {
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 device_cloud_policy_manager_->device_store()->policy(); 370 device_cloud_policy_manager_->device_store()->policy();
363 if (policy_data) { 371 if (policy_data) {
364 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(), 372 affiliation_ids.insert(policy_data->device_affiliation_ids().begin(),
365 policy_data->device_affiliation_ids().end()); 373 policy_data->device_affiliation_ids().end());
366 } 374 }
367 } 375 }
368 return affiliation_ids; 376 return affiliation_ids;
369 } 377 }
370 378
371 } // namespace policy 379 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698