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" |
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
487 device_data_store_->set_machine_model(machine_model); | 487 device_data_store_->set_machine_model(machine_model); |
488 } | 488 } |
489 | 489 |
490 device_cloud_policy_subsystem_->CompleteInitialization( | 490 device_cloud_policy_subsystem_->CompleteInitialization( |
491 prefs::kDevicePolicyRefreshRate, | 491 prefs::kDevicePolicyRefreshRate, |
492 kServiceInitializationStartupDelay); | 492 kServiceInitializationStartupDelay); |
493 } | 493 } |
494 device_data_store_->set_device_status_collector( | 494 device_data_store_->set_device_status_collector( |
495 new DeviceStatusCollector( | 495 new DeviceStatusCollector( |
496 g_browser_process->local_state(), | 496 g_browser_process->local_state(), |
497 chromeos::system::StatisticsProvider::GetInstance())); | 497 chromeos::system::StatisticsProvider::GetInstance(), |
| 498 NULL)); |
498 #endif | 499 #endif |
499 } | 500 } |
500 | 501 |
501 // static | 502 // static |
502 ConfigurationPolicyProvider* | 503 ConfigurationPolicyProvider* |
503 BrowserPolicyConnector::CreateManagedPlatformProvider() { | 504 BrowserPolicyConnector::CreateManagedPlatformProvider() { |
504 const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList(); | 505 const PolicyDefinitionList* policy_list = GetChromePolicyDefinitionList(); |
505 #if defined(OS_WIN) | 506 #if defined(OS_WIN) |
506 return new ConfigurationPolicyProviderWin(policy_list, | 507 return new ConfigurationPolicyProviderWin(policy_list, |
507 policy::kRegistryMandatorySubKey, | 508 policy::kRegistryMandatorySubKey, |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
546 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); | 547 config_dir_path.Append(FILE_PATH_LITERAL("recommended"))); |
547 } else { | 548 } else { |
548 return NULL; | 549 return NULL; |
549 } | 550 } |
550 #else | 551 #else |
551 return NULL; | 552 return NULL; |
552 #endif | 553 #endif |
553 } | 554 } |
554 | 555 |
555 } // namespace policy | 556 } // namespace policy |
OLD | NEW |