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 21 matching lines...) Expand all Loading... |
32 #include "chrome/browser/policy/cloud/device_management_service.h" | 32 #include "chrome/browser/policy/cloud/device_management_service.h" |
33 #include "chrome/browser/policy/configuration_policy_provider.h" | 33 #include "chrome/browser/policy/configuration_policy_provider.h" |
34 #include "chrome/browser/policy/policy_domain_descriptor.h" | 34 #include "chrome/browser/policy/policy_domain_descriptor.h" |
35 #include "chrome/browser/policy/policy_service_impl.h" | 35 #include "chrome/browser/policy/policy_service_impl.h" |
36 #include "chrome/browser/policy/policy_statistics_collector.h" | 36 #include "chrome/browser/policy/policy_statistics_collector.h" |
37 #include "chrome/common/chrome_paths.h" | 37 #include "chrome/common/chrome_paths.h" |
38 #include "chrome/common/chrome_switches.h" | 38 #include "chrome/common/chrome_switches.h" |
39 #include "chrome/common/chrome_version_info.h" | 39 #include "chrome/common/chrome_version_info.h" |
40 #include "chrome/common/pref_names.h" | 40 #include "chrome/common/pref_names.h" |
41 #include "components/policy/core/common/policy_pref_names.h" | 41 #include "components/policy/core/common/policy_pref_names.h" |
| 42 #include "components/policy/core/common/schema.h" |
42 #include "content/public/browser/browser_thread.h" | 43 #include "content/public/browser/browser_thread.h" |
43 #include "content/public/common/content_client.h" | 44 #include "content/public/common/content_client.h" |
44 #include "google_apis/gaia/gaia_auth_util.h" | 45 #include "google_apis/gaia/gaia_auth_util.h" |
45 #include "google_apis/gaia/gaia_constants.h" | 46 #include "google_apis/gaia/gaia_constants.h" |
46 #include "grit/generated_resources.h" | 47 #include "grit/generated_resources.h" |
47 #include "net/url_request/url_request_context_getter.h" | 48 #include "net/url_request/url_request_context_getter.h" |
48 #include "policy/policy_constants.h" | 49 #include "policy/policy_constants.h" |
49 #include "third_party/icu/source/i18n/unicode/regex.h" | 50 #include "third_party/icu/source/i18n/unicode/regex.h" |
50 #include "url/gurl.h" | 51 #include "url/gurl.h" |
51 | 52 |
(...skipping 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
417 #if defined(OS_CHROMEOS) | 418 #if defined(OS_CHROMEOS) |
418 if (device_cloud_policy_manager_) | 419 if (device_cloud_policy_manager_) |
419 providers.push_back(device_cloud_policy_manager_.get()); | 420 providers.push_back(device_cloud_policy_manager_.get()); |
420 #endif | 421 #endif |
421 std::copy(additional_providers.begin(), additional_providers.end(), | 422 std::copy(additional_providers.begin(), additional_providers.end(), |
422 std::back_inserter(providers)); | 423 std::back_inserter(providers)); |
423 } | 424 } |
424 scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers)); | 425 scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers)); |
425 scoped_refptr<PolicyDomainDescriptor> descriptor = new PolicyDomainDescriptor( | 426 scoped_refptr<PolicyDomainDescriptor> descriptor = new PolicyDomainDescriptor( |
426 POLICY_DOMAIN_CHROME); | 427 POLICY_DOMAIN_CHROME); |
| 428 descriptor->RegisterComponent("", SchemaOwner::Wrap(GetChromeSchemaData())); |
427 service->RegisterPolicyDomain(descriptor); | 429 service->RegisterPolicyDomain(descriptor); |
428 return service.Pass(); | 430 return service.Pass(); |
429 } | 431 } |
430 | 432 |
431 const ConfigurationPolicyHandlerList* | 433 const ConfigurationPolicyHandlerList* |
432 BrowserPolicyConnector::GetHandlerList() const { | 434 BrowserPolicyConnector::GetHandlerList() const { |
433 return handler_list_.get(); | 435 return handler_list_.get(); |
434 } | 436 } |
435 | 437 |
436 UserAffiliation BrowserPolicyConnector::GetUserAffiliation( | 438 UserAffiliation BrowserPolicyConnector::GetUserAffiliation( |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 return new AsyncPolicyProvider(loader.Pass()); | 596 return new AsyncPolicyProvider(loader.Pass()); |
595 } else { | 597 } else { |
596 return NULL; | 598 return NULL; |
597 } | 599 } |
598 #else | 600 #else |
599 return NULL; | 601 return NULL; |
600 #endif | 602 #endif |
601 } | 603 } |
602 | 604 |
603 } // namespace policy | 605 } // namespace policy |
OLD | NEW |