| 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 15 matching lines...) Expand all Loading... |
| 26 #include "chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h" | 26 #include "chrome/browser/policy/cloud/cloud_policy_refresh_scheduler.h" |
| 27 #include "chrome/browser/policy/cloud/cloud_policy_service.h" | 27 #include "chrome/browser/policy/cloud/cloud_policy_service.h" |
| 28 #include "chrome/browser/policy/cloud/device_management_service.h" | 28 #include "chrome/browser/policy/cloud/device_management_service.h" |
| 29 #include "chrome/browser/policy/configuration_policy_provider.h" | 29 #include "chrome/browser/policy/configuration_policy_provider.h" |
| 30 #include "chrome/browser/policy/policy_domain_descriptor.h" | 30 #include "chrome/browser/policy/policy_domain_descriptor.h" |
| 31 #include "chrome/browser/policy/policy_service_impl.h" | 31 #include "chrome/browser/policy/policy_service_impl.h" |
| 32 #include "chrome/browser/policy/policy_statistics_collector.h" | 32 #include "chrome/browser/policy/policy_statistics_collector.h" |
| 33 #include "chrome/common/chrome_paths.h" | 33 #include "chrome/common/chrome_paths.h" |
| 34 #include "chrome/common/chrome_switches.h" | 34 #include "chrome/common/chrome_switches.h" |
| 35 #include "chrome/common/pref_names.h" | 35 #include "chrome/common/pref_names.h" |
| 36 #include "components/policy/core/common/schema.h" |
| 36 #include "content/public/browser/browser_thread.h" | 37 #include "content/public/browser/browser_thread.h" |
| 37 #include "google_apis/gaia/gaia_auth_util.h" | 38 #include "google_apis/gaia/gaia_auth_util.h" |
| 38 #include "google_apis/gaia/gaia_constants.h" | 39 #include "google_apis/gaia/gaia_constants.h" |
| 39 #include "grit/generated_resources.h" | 40 #include "grit/generated_resources.h" |
| 40 #include "net/url_request/url_request_context_getter.h" | 41 #include "net/url_request/url_request_context_getter.h" |
| 41 #include "policy/policy_constants.h" | 42 #include "policy/policy_constants.h" |
| 42 #include "third_party/icu/source/i18n/unicode/regex.h" | 43 #include "third_party/icu/source/i18n/unicode/regex.h" |
| 43 | 44 |
| 44 #if defined(OS_WIN) | 45 #if defined(OS_WIN) |
| 45 #include "chrome/browser/policy/policy_loader_win.h" | 46 #include "chrome/browser/policy/policy_loader_win.h" |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 319 #if defined(OS_CHROMEOS) | 320 #if defined(OS_CHROMEOS) |
| 320 if (device_cloud_policy_manager_) | 321 if (device_cloud_policy_manager_) |
| 321 providers.push_back(device_cloud_policy_manager_.get()); | 322 providers.push_back(device_cloud_policy_manager_.get()); |
| 322 #endif | 323 #endif |
| 323 std::copy(additional_providers.begin(), additional_providers.end(), | 324 std::copy(additional_providers.begin(), additional_providers.end(), |
| 324 std::back_inserter(providers)); | 325 std::back_inserter(providers)); |
| 325 } | 326 } |
| 326 scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers)); | 327 scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers)); |
| 327 scoped_refptr<PolicyDomainDescriptor> descriptor = new PolicyDomainDescriptor( | 328 scoped_refptr<PolicyDomainDescriptor> descriptor = new PolicyDomainDescriptor( |
| 328 POLICY_DOMAIN_CHROME); | 329 POLICY_DOMAIN_CHROME); |
| 330 descriptor->RegisterComponent("", SchemaOwner::Wrap(GetChromeSchemaNode())); |
| 329 service->RegisterPolicyDomain(descriptor); | 331 service->RegisterPolicyDomain(descriptor); |
| 330 return service.Pass(); | 332 return service.Pass(); |
| 331 } | 333 } |
| 332 | 334 |
| 333 const ConfigurationPolicyHandlerList* | 335 const ConfigurationPolicyHandlerList* |
| 334 BrowserPolicyConnector::GetHandlerList() const { | 336 BrowserPolicyConnector::GetHandlerList() const { |
| 335 return &handler_list_; | 337 return &handler_list_; |
| 336 } | 338 } |
| 337 | 339 |
| 338 UserAffiliation BrowserPolicyConnector::GetUserAffiliation( | 340 UserAffiliation BrowserPolicyConnector::GetUserAffiliation( |
| (...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 499 return new AsyncPolicyProvider(loader.Pass()); | 501 return new AsyncPolicyProvider(loader.Pass()); |
| 500 } else { | 502 } else { |
| 501 return NULL; | 503 return NULL; |
| 502 } | 504 } |
| 503 #else | 505 #else |
| 504 return NULL; | 506 return NULL; |
| 505 #endif | 507 #endif |
| 506 } | 508 } |
| 507 | 509 |
| 508 } // namespace policy | 510 } // namespace policy |
| OLD | NEW |