OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/file_path.h" | 9 #include "base/file_path.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| 11 #include "chrome/browser/browser_process.h" |
11 #include "chrome/browser/net/gaia/token_service.h" | 12 #include "chrome/browser/net/gaia/token_service.h" |
12 #include "chrome/browser/policy/cloud_policy_provider.h" | 13 #include "chrome/browser/policy/cloud_policy_provider.h" |
13 #include "chrome/browser/policy/cloud_policy_provider_impl.h" | 14 #include "chrome/browser/policy/cloud_policy_provider_impl.h" |
14 #include "chrome/browser/policy/cloud_policy_subsystem.h" | 15 #include "chrome/browser/policy/cloud_policy_subsystem.h" |
15 #include "chrome/browser/policy/configuration_policy_pref_store.h" | 16 #include "chrome/browser/policy/configuration_policy_pref_store.h" |
16 #include "chrome/browser/policy/configuration_policy_provider.h" | 17 #include "chrome/browser/policy/configuration_policy_provider.h" |
17 #include "chrome/browser/policy/network_configuration_updater.h" | 18 #include "chrome/browser/policy/network_configuration_updater.h" |
18 #include "chrome/browser/policy/user_policy_cache.h" | 19 #include "chrome/browser/policy/user_policy_cache.h" |
19 #include "chrome/browser/policy/user_policy_token_cache.h" | 20 #include "chrome/browser/policy/user_policy_token_cache.h" |
20 #include "chrome/common/chrome_notification_types.h" | 21 #include "chrome/common/chrome_notification_types.h" |
(...skipping 394 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
415 managed_cloud_provider_->AppendCache(device_policy_cache); | 416 managed_cloud_provider_->AppendCache(device_policy_cache); |
416 recommended_cloud_provider_->AppendCache(device_policy_cache); | 417 recommended_cloud_provider_->AppendCache(device_policy_cache); |
417 | 418 |
418 device_cloud_policy_subsystem_.reset(new CloudPolicySubsystem( | 419 device_cloud_policy_subsystem_.reset(new CloudPolicySubsystem( |
419 device_data_store_.get(), | 420 device_data_store_.get(), |
420 device_policy_cache)); | 421 device_policy_cache)); |
421 | 422 |
422 // Initialize the subsystem once the message loops are spinning. | 423 // Initialize the subsystem once the message loops are spinning. |
423 MessageLoop::current()->PostTask( | 424 MessageLoop::current()->PostTask( |
424 FROM_HERE, | 425 FROM_HERE, |
425 base::Bind(&BrowserPolicyConnector::InitializeDevicePolicySubsystem, | 426 base::Bind(&BrowserPolicyConnector::CompleteInitialization, |
426 weak_ptr_factory_.GetWeakPtr())); | 427 weak_ptr_factory_.GetWeakPtr())); |
427 } | 428 } |
428 #endif | 429 #endif |
429 } | 430 } |
430 | 431 |
431 void BrowserPolicyConnector::InitializeDevicePolicySubsystem() { | 432 void BrowserPolicyConnector::CompleteInitialization() { |
432 #if defined(OS_CHROMEOS) | 433 #if defined(OS_CHROMEOS) |
433 if (device_cloud_policy_subsystem_.get()) { | 434 if (device_cloud_policy_subsystem_.get()) { |
434 device_cloud_policy_subsystem_->CompleteInitialization( | 435 device_cloud_policy_subsystem_->CompleteInitialization( |
435 prefs::kDevicePolicyRefreshRate, | 436 prefs::kDevicePolicyRefreshRate, |
436 kServiceInitializationStartupDelay); | 437 kServiceInitializationStartupDelay); |
437 } | 438 } |
| 439 device_data_store_->set_device_status_collector( |
| 440 new DeviceStatusCollector(g_browser_process->local_state())); |
438 #endif | 441 #endif |
439 } | 442 } |
440 | 443 |
441 // static | 444 // static |
442 ConfigurationPolicyProvider* | 445 ConfigurationPolicyProvider* |
443 BrowserPolicyConnector::CreateManagedPlatformProvider() { | 446 BrowserPolicyConnector::CreateManagedPlatformProvider() { |
444 const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList(); | 447 const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList(); |
445 #if defined(OS_WIN) | 448 #if defined(OS_WIN) |
446 return new ConfigurationPolicyProviderWin(policy_list, | 449 return new ConfigurationPolicyProviderWin(policy_list, |
447 policy::kRegistryMandatorySubKey); | 450 policy::kRegistryMandatorySubKey); |
(...skipping 29 matching lines...) Expand all Loading... |
477 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); | 480 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); |
478 } else { | 481 } else { |
479 return NULL; | 482 return NULL; |
480 } | 483 } |
481 #else | 484 #else |
482 return NULL; | 485 return NULL; |
483 #endif | 486 #endif |
484 } | 487 } |
485 | 488 |
486 } // namespace policy | 489 } // namespace policy |
OLD | NEW |