Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/profile_impl.h" | 5 #include "chrome/browser/profile_impl.h" |
| 6 | 6 |
| 7 #include "app/resource_bundle.h" | 7 #include "app/resource_bundle.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/environment.h" | 9 #include "base/environment.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 1315 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1326 return NULL; | 1326 return NULL; |
| 1327 | 1327 |
| 1328 if (!device_management_policy_provider_.get()) { | 1328 if (!device_management_policy_provider_.get()) { |
| 1329 device_management_policy_provider_.reset( | 1329 device_management_policy_provider_.reset( |
| 1330 new policy::DeviceManagementPolicyProvider( | 1330 new policy::DeviceManagementPolicyProvider( |
| 1331 policy::ConfigurationPolicyPrefStore:: | 1331 policy::ConfigurationPolicyPrefStore:: |
| 1332 GetChromePolicyDefinitionList(), | 1332 GetChromePolicyDefinitionList(), |
| 1333 new policy::DeviceManagementBackendImpl( | 1333 new policy::DeviceManagementBackendImpl( |
| 1334 command_line->GetSwitchValueASCII( | 1334 command_line->GetSwitchValueASCII( |
| 1335 switches::kDeviceManagementUrl)), | 1335 switches::kDeviceManagementUrl)), |
| 1336 GetTokenService(), | 1336 this)); |
|
Mattias Nissler (ping if slow)
2010/11/22 20:36:08
Note this part of the code needs rebasing, the pol
gfeher
2010/11/23 13:47:51
Done.
| |
| 1337 GetPath())); | |
| 1338 } | 1337 } |
| 1339 return device_management_policy_provider_.get(); | 1338 return device_management_policy_provider_.get(); |
| 1340 } | 1339 } |
| 1341 | 1340 |
| 1342 PromoCounter* ProfileImpl::GetInstantPromoCounter() { | 1341 PromoCounter* ProfileImpl::GetInstantPromoCounter() { |
| 1343 #if defined(OS_WIN) | 1342 #if defined(OS_WIN) |
| 1344 // TODO: enable this when we're ready to turn on the promo. | 1343 // TODO: enable this when we're ready to turn on the promo. |
| 1345 /* | 1344 /* |
| 1346 if (!checked_instant_promo_) { | 1345 if (!checked_instant_promo_) { |
| 1347 checked_instant_promo_ = true; | 1346 checked_instant_promo_ = true; |
| (...skipping 16 matching lines...) Expand all Loading... | |
| 1364 #if defined(OS_CHROMEOS) | 1363 #if defined(OS_CHROMEOS) |
| 1365 chromeos::ProxyConfigServiceImpl* | 1364 chromeos::ProxyConfigServiceImpl* |
| 1366 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { | 1365 ProfileImpl::GetChromeOSProxyConfigServiceImpl() { |
| 1367 if (!chromeos_proxy_config_service_impl_) { | 1366 if (!chromeos_proxy_config_service_impl_) { |
| 1368 chromeos_proxy_config_service_impl_ = | 1367 chromeos_proxy_config_service_impl_ = |
| 1369 new chromeos::ProxyConfigServiceImpl(); | 1368 new chromeos::ProxyConfigServiceImpl(); |
| 1370 } | 1369 } |
| 1371 return chromeos_proxy_config_service_impl_; | 1370 return chromeos_proxy_config_service_impl_; |
| 1372 } | 1371 } |
| 1373 #endif // defined(OS_CHROMEOS) | 1372 #endif // defined(OS_CHROMEOS) |
| OLD | NEW |