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" |
11 #include "base/bind_helpers.h" | 11 #include "base/bind_helpers.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/files/file_path.h" | 13 #include "base/files/file_path.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/message_loop.h" | 15 #include "base/message_loop.h" |
16 #include "base/path_service.h" | 16 #include "base/path_service.h" |
17 #include "base/prefs/pref_registry_simple.h" | 17 #include "base/prefs/pref_registry_simple.h" |
18 #include "base/prefs/pref_service.h" | 18 #include "base/prefs/pref_service.h" |
19 #include "base/string_util.h" | 19 #include "base/string_util.h" |
20 #include "base/utf_string_conversions.h" | 20 #include "base/utf_string_conversions.h" |
21 #include "chrome/browser/browser_process.h" | 21 #include "chrome/browser/browser_process.h" |
22 #include "chrome/browser/policy/async_policy_provider.h" | 22 #include "chrome/browser/policy/async_policy_provider.h" |
23 #include "chrome/browser/policy/cloud/cloud_policy_client.h" | 23 #include "chrome/browser/policy/cloud/cloud_policy_client.h" |
24 #include "chrome/browser/policy/cloud/cloud_policy_service.h" | 24 #include "chrome/browser/policy/cloud/cloud_policy_service.h" |
25 #include "chrome/browser/policy/cloud/device_management_service.h" | 25 #include "chrome/browser/policy/cloud/device_management_service.h" |
26 #include "chrome/browser/policy/configuration_policy_provider.h" | 26 #include "chrome/browser/policy/configuration_policy_provider.h" |
27 #include "chrome/browser/policy/managed_mode_policy_provider.h" | 27 #include "chrome/browser/policy/managed_mode_policy_provider.h" |
28 #include "chrome/browser/policy/policy_domain_descriptor.h" | |
28 #include "chrome/browser/policy/policy_service_impl.h" | 29 #include "chrome/browser/policy/policy_service_impl.h" |
29 #include "chrome/browser/policy/policy_statistics_collector.h" | 30 #include "chrome/browser/policy/policy_statistics_collector.h" |
30 #include "chrome/common/chrome_paths.h" | 31 #include "chrome/common/chrome_paths.h" |
31 #include "chrome/common/chrome_switches.h" | 32 #include "chrome/common/chrome_switches.h" |
32 #include "chrome/common/pref_names.h" | 33 #include "chrome/common/pref_names.h" |
33 #include "content/public/browser/browser_thread.h" | 34 #include "content/public/browser/browser_thread.h" |
34 #include "google_apis/gaia/gaia_auth_util.h" | 35 #include "google_apis/gaia/gaia_auth_util.h" |
35 #include "google_apis/gaia/gaia_constants.h" | 36 #include "google_apis/gaia/gaia_constants.h" |
36 #include "grit/generated_resources.h" | 37 #include "grit/generated_resources.h" |
37 #include "net/url_request/url_request_context_getter.h" | 38 #include "net/url_request/url_request_context_getter.h" |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
282 if (platform_provider_) | 283 if (platform_provider_) |
283 providers.push_back(platform_provider_.get()); | 284 providers.push_back(platform_provider_.get()); |
284 #if defined(OS_CHROMEOS) | 285 #if defined(OS_CHROMEOS) |
285 if (device_cloud_policy_manager_) | 286 if (device_cloud_policy_manager_) |
286 providers.push_back(device_cloud_policy_manager_.get()); | 287 providers.push_back(device_cloud_policy_manager_.get()); |
287 #endif | 288 #endif |
288 std::copy(additional_providers.begin(), additional_providers.end(), | 289 std::copy(additional_providers.begin(), additional_providers.end(), |
289 std::back_inserter(providers)); | 290 std::back_inserter(providers)); |
290 } | 291 } |
291 scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers)); | 292 scoped_ptr<PolicyService> service(new PolicyServiceImpl(providers)); |
292 service->RegisterPolicyDomain(POLICY_DOMAIN_CHROME, std::set<std::string>()); | 293 scoped_refptr<PolicyDomainDescriptor> descriptor = new PolicyDomainDescriptor( |
294 POLICY_DOMAIN_CHROME); | |
Mattias Nissler (ping if slow)
2013/05/15 10:24:06
Any plans to pass the Chrome schema here as well?
Joao da Silva
2013/05/19 13:17:55
Yes it is :-) Having a complete PolicySchema for C
| |
295 service->RegisterPolicyDomain(descriptor); | |
293 return service.Pass(); | 296 return service.Pass(); |
294 } | 297 } |
295 | 298 |
296 const ConfigurationPolicyHandlerList* | 299 const ConfigurationPolicyHandlerList* |
297 BrowserPolicyConnector::GetHandlerList() const { | 300 BrowserPolicyConnector::GetHandlerList() const { |
298 return &handler_list_; | 301 return &handler_list_; |
299 } | 302 } |
300 | 303 |
301 UserAffiliation BrowserPolicyConnector::GetUserAffiliation( | 304 UserAffiliation BrowserPolicyConnector::GetUserAffiliation( |
302 const std::string& user_name) { | 305 const std::string& user_name) { |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
484 return new AsyncPolicyProvider(loader.Pass()); | 487 return new AsyncPolicyProvider(loader.Pass()); |
485 } else { | 488 } else { |
486 return NULL; | 489 return NULL; |
487 } | 490 } |
488 #else | 491 #else |
489 return NULL; | 492 return NULL; |
490 #endif | 493 #endif |
491 } | 494 } |
492 | 495 |
493 } // namespace policy | 496 } // namespace policy |
OLD | NEW |