| 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 "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| 11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
| 12 #include "chrome/browser/browser_process.h" | 12 #include "chrome/browser/browser_process.h" |
| 13 #include "chrome/browser/policy/async_policy_provider.h" | 13 #include "chrome/browser/policy/async_policy_provider.h" |
| 14 #include "chrome/browser/policy/cloud_policy_client.h" | 14 #include "chrome/browser/policy/cloud_policy_client.h" |
| 15 #include "chrome/browser/policy/cloud_policy_provider.h" | 15 #include "chrome/browser/policy/cloud_policy_provider.h" |
| 16 #include "chrome/browser/policy/cloud_policy_service.h" | 16 #include "chrome/browser/policy/cloud_policy_service.h" |
| 17 #include "chrome/browser/policy/cloud_policy_subsystem.h" | 17 #include "chrome/browser/policy/cloud_policy_subsystem.h" |
| 18 #include "chrome/browser/policy/configuration_policy_provider.h" | 18 #include "chrome/browser/policy/configuration_policy_provider.h" |
| 19 #include "chrome/browser/policy/device_management_service.h" | 19 #include "chrome/browser/policy/device_management_service.h" |
| 20 #include "chrome/browser/policy/managed_mode_policy_provider.h" |
| 21 #include "chrome/browser/policy/managed_mode_policy_provider_factory.h" |
| 20 #include "chrome/browser/policy/policy_service_impl.h" | 22 #include "chrome/browser/policy/policy_service_impl.h" |
| 21 #include "chrome/browser/policy/user_cloud_policy_manager.h" | 23 #include "chrome/browser/policy/user_cloud_policy_manager.h" |
| 22 #include "chrome/browser/policy/user_policy_cache.h" | 24 #include "chrome/browser/policy/user_policy_cache.h" |
| 23 #include "chrome/browser/policy/user_policy_token_cache.h" | 25 #include "chrome/browser/policy/user_policy_token_cache.h" |
| 24 #include "chrome/browser/signin/token_service.h" | 26 #include "chrome/browser/signin/token_service.h" |
| 25 #include "chrome/common/chrome_notification_types.h" | 27 #include "chrome/common/chrome_notification_types.h" |
| 26 #include "chrome/common/chrome_paths.h" | 28 #include "chrome/common/chrome_paths.h" |
| 27 #include "chrome/common/chrome_switches.h" | 29 #include "chrome/common/chrome_switches.h" |
| 28 #include "chrome/common/net/gaia/gaia_constants.h" | 30 #include "chrome/common/net/gaia/gaia_constants.h" |
| 29 #include "chrome/common/pref_names.h" | 31 #include "chrome/common/pref_names.h" |
| (...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 if (recommended_cloud_provider_.get()) | 169 if (recommended_cloud_provider_.get()) |
| 168 providers.push_back(recommended_cloud_provider_.get()); | 170 providers.push_back(recommended_cloud_provider_.get()); |
| 169 | 171 |
| 170 // The global policy service uses the proxy provider to allow for swapping in | 172 // The global policy service uses the proxy provider to allow for swapping in |
| 171 // user policy after startup, while profiles use |user_cloud_policy_manager_| | 173 // user policy after startup, while profiles use |user_cloud_policy_manager_| |
| 172 // directly as their provider, which may also block initialization on a policy | 174 // directly as their provider, which may also block initialization on a policy |
| 173 // fetch at login time. | 175 // fetch at login time. |
| 174 if (profile) { | 176 if (profile) { |
| 175 if (user_cloud_policy_manager_.get()) | 177 if (user_cloud_policy_manager_.get()) |
| 176 providers.push_back(user_cloud_policy_manager_.get()); | 178 providers.push_back(user_cloud_policy_manager_.get()); |
| 179 |
| 180 providers.push_back( |
| 181 ManagedModePolicyProviderFactory::GetForProfile(profile)); |
| 177 } else { | 182 } else { |
| 178 providers.push_back(&user_cloud_policy_provider_); | 183 providers.push_back(&user_cloud_policy_provider_); |
| 179 } | 184 } |
| 180 | 185 |
| 181 return new PolicyServiceImpl(providers); | 186 return new PolicyServiceImpl(providers); |
| 182 } | 187 } |
| 183 | 188 |
| 184 void BrowserPolicyConnector::RegisterForDevicePolicy( | 189 void BrowserPolicyConnector::RegisterForDevicePolicy( |
| 185 const std::string& owner_email, | 190 const std::string& owner_email, |
| 186 const std::string& token, | 191 const std::string& token, |
| (...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 return new AsyncPolicyProvider(loader.Pass()); | 574 return new AsyncPolicyProvider(loader.Pass()); |
| 570 } else { | 575 } else { |
| 571 return NULL; | 576 return NULL; |
| 572 } | 577 } |
| 573 #else | 578 #else |
| 574 return NULL; | 579 return NULL; |
| 575 #endif | 580 #endif |
| 576 } | 581 } |
| 577 | 582 |
| 578 } // namespace policy | 583 } // namespace policy |
| OLD | NEW |