diff options
| author | davidyu@chromium.org <davidyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 01:48:22 +0000 |
|---|---|---|
| committer | davidyu@chromium.org <davidyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-19 01:48:22 +0000 |
| commit | a0e44ccf2581ce5440883c2eb355128ca5fb9c18 (patch) | |
| tree | ffc7c6ad0b17feccafa14455bfe82e47b3021e39 /chrome/browser/prefs | |
| parent | 37564e5f05d71416c81ac049de6bcd43153d5b07 (diff) | |
| download | chromium_src-a0e44ccf2581ce5440883c2eb355128ca5fb9c18.zip chromium_src-a0e44ccf2581ce5440883c2eb355128ca5fb9c18.tar.gz chromium_src-a0e44ccf2581ce5440883c2eb355128ca5fb9c18.tar.bz2 | |
Implement Enterprise Key API.
Proposal: https://docs.google.com/a/google.com/document/d/1KxtQCk4SJdAZId8WxtnCxR3kS2KvhFDsU0SdAeP18Xc/edit
The logic of the API is implemented. Add prefernces and policies are added.
The underlying cryptohome_client will be implemented in another CL.
BUG=chromium:219963
TEST=unit_tests
Review URL: https://chromiumcodereview.appspot.com/13132004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/browser_prefs.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc index 52389b2..611914f1 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc @@ -133,6 +133,7 @@ #include "chrome/browser/chromeos/settings/device_settings_cache.h" #include "chrome/browser/chromeos/status/data_promo_notification.h" #include "chrome/browser/chromeos/system/automatic_reboot_manager.h" +#include "chrome/browser/extensions/api/enterprise_platform_keys_private/enterprise_platform_keys_private_api.h" #else #include "chrome/browser/extensions/default_apps.h" #endif @@ -354,6 +355,8 @@ void RegisterUserPrefs(PrefRegistrySyncable* registry) { chromeos::OAuth2LoginManager::RegisterUserPrefs(registry); chromeos::Preferences::RegisterUserPrefs(registry); chromeos::ProxyConfigServiceImpl::RegisterUserPrefs(registry); + extensions::EnterprisePlatformKeysPrivateChallengeUserKeyFunction:: + RegisterUserPrefs(registry); FlagsUI::RegisterUserPrefs(registry); #endif |