| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/policy/browser_policy_connector.h" | 5 #include "chrome/browser/policy/browser_policy_connector.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <iterator> | 8 #include <iterator> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 418 #if defined(OS_CHROMEOS) | 418 #if defined(OS_CHROMEOS) |
| 419 if (device_cloud_policy_manager_) | 419 if (device_cloud_policy_manager_) |
| 420 providers.push_back(device_cloud_policy_manager_.get()); | 420 providers.push_back(device_cloud_policy_manager_.get()); |
| 421 #endif | 421 #endif |
| 422 std::copy(additional_providers.begin(), additional_providers.end(), | 422 std::copy(additional_providers.begin(), additional_providers.end(), |
| 423 std::back_inserter(providers)); | 423 std::back_inserter(providers)); |
| 424 } | 424 } |
| 425 scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers)); | 425 scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers)); |
| 426 scoped_refptr<PolicyDomainDescriptor> descriptor = new PolicyDomainDescriptor( | 426 scoped_refptr<PolicyDomainDescriptor> descriptor = new PolicyDomainDescriptor( |
| 427 POLICY_DOMAIN_CHROME); | 427 POLICY_DOMAIN_CHROME); |
| 428 descriptor->RegisterComponent("", SchemaOwner::Wrap(GetChromeSchemaData())); | 428 descriptor->RegisterComponent("", Schema::Wrap(GetChromeSchemaData())); |
| 429 service->RegisterPolicyDomain(descriptor); | 429 service->RegisterPolicyDomain(descriptor); |
| 430 return service.Pass(); | 430 return service.Pass(); |
| 431 } | 431 } |
| 432 | 432 |
| 433 const ConfigurationPolicyHandlerList* | 433 const ConfigurationPolicyHandlerList* |
| 434 BrowserPolicyConnector::GetHandlerList() const { | 434 BrowserPolicyConnector::GetHandlerList() const { |
| 435 return handler_list_.get(); | 435 return handler_list_.get(); |
| 436 } | 436 } |
| 437 | 437 |
| 438 UserAffiliation BrowserPolicyConnector::GetUserAffiliation( | 438 UserAffiliation BrowserPolicyConnector::GetUserAffiliation( |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 596 return new AsyncPolicyProvider(loader.Pass()); | 596 return new AsyncPolicyProvider(loader.Pass()); |
| 597 } else { | 597 } else { |
| 598 return NULL; | 598 return NULL; |
| 599 } | 599 } |
| 600 #else | 600 #else |
| 601 return NULL; | 601 return NULL; |
| 602 #endif | 602 #endif |
| 603 } | 603 } |
| 604 | 604 |
| 605 } // namespace policy | 605 } // namespace policy |
| OLD | NEW |