diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 16:01:24 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-15 16:01:24 +0000 |
| commit | 031857d5c3e4019dca3ae999792d1fe6b0798bd1 (patch) | |
| tree | 7da4f572bd098144bcac231aeefbc1324024bee2 /chrome/browser/pref_service.cc | |
| parent | 4077b5513dfa5b88c9eba58c3c6db41f26c62125 (diff) | |
| download | chromium_src-031857d5c3e4019dca3ae999792d1fe6b0798bd1.zip chromium_src-031857d5c3e4019dca3ae999792d1fe6b0798bd1.tar.gz chromium_src-031857d5c3e4019dca3ae999792d1fe6b0798bd1.tar.bz2 | |
Add the Mac policy provider to the pref service.
BUG=http://crbug.com/7147
TEST=as in bug
Review URL: http://codereview.chromium.org/2806003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/pref_service.cc')
| -rw-r--r-- | chrome/browser/pref_service.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/pref_service.cc b/chrome/browser/pref_service.cc index 2bd6531..32aeda0 100644 --- a/chrome/browser/pref_service.cc +++ b/chrome/browser/pref_service.cc @@ -21,7 +21,7 @@ #if defined(OS_WIN) #include "chrome/browser/configuration_policy_provider_win.h" #elif defined(OS_MACOSX) -#include "chrome/browser/dummy_configuration_policy_provider.h" +#include "chrome/browser/configuration_policy_provider_mac.h" #elif defined(OS_POSIX) #include "chrome/browser/dummy_configuration_policy_provider.h" #endif @@ -96,8 +96,7 @@ PrefService* PrefService::CreatePrefService(const FilePath& pref_filename) { #if defined(OS_WIN) managed_prefs_provider = new ConfigurationPolicyProviderWin(); #elif defined(OS_MACOSX) - // TODO(markusheintz): Will be replaced by the Mac implementation. - managed_prefs_provider = new DummyConfigurationPolicyProvider(); + managed_prefs_provider = new ConfigurationPolicyProviderMac(); #elif defined(OS_POSIX) // TODO(markusheintz): Will be replaced by the Linux implementation. managed_prefs_provider = new DummyConfigurationPolicyProvider(); |