| Index: chrome/browser/policy/browser_policy_connector.cc
|
| diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
|
| index 4c1967b390c738dbc5bfff9b2850052d0443567e..4fe41d312912e1438062d0f8812a4a8db34c5431 100644
|
| --- a/chrome/browser/policy/browser_policy_connector.cc
|
| +++ b/chrome/browser/policy/browser_policy_connector.cc
|
| @@ -10,6 +10,7 @@
|
| #include "base/file_path.h"
|
| #include "base/path_service.h"
|
| #include "chrome/browser/browser_process.h"
|
| +#include "chrome/browser/policy/async_policy_provider.h"
|
| #include "chrome/browser/policy/cloud_policy_provider.h"
|
| #include "chrome/browser/policy/cloud_policy_subsystem.h"
|
| #include "chrome/browser/policy/configuration_policy_provider.h"
|
| @@ -30,7 +31,8 @@
|
| #if defined(OS_WIN)
|
| #include "chrome/browser/policy/configuration_policy_provider_win.h"
|
| #elif defined(OS_MACOSX)
|
| -#include "chrome/browser/policy/configuration_policy_provider_mac.h"
|
| +#include "chrome/browser/policy/policy_loader_mac.h"
|
| +#include "chrome/browser/preferences_mac.h"
|
| #elif defined(OS_POSIX)
|
| #include "chrome/browser/policy/config_dir_policy_provider.h"
|
| #endif
|
| @@ -507,7 +509,9 @@ ConfigurationPolicyProvider*
|
| #if defined(OS_WIN)
|
| return new ConfigurationPolicyProviderWin(policy_list);
|
| #elif defined(OS_MACOSX)
|
| - return new ConfigurationPolicyProviderMac(policy_list);
|
| + scoped_ptr<AsyncPolicyLoader> loader(
|
| + new MacPolicyLoader(policy_list, new MacPreferences()));
|
| + return new AsyncPolicyProvider(policy_list, loader.Pass());
|
| #elif defined(OS_POSIX)
|
| FilePath config_dir_path;
|
| if (PathService::Get(chrome::DIR_POLICY_FILES, &config_dir_path)) {
|
|
|