chrome/browser/prefs/browser_prefs.cc - Issue 13132004: Implement Enterprise Key API.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/prefs/browser_prefs.cc

Issue 13132004: Implement Enterprise Key API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 7 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/prefs/browser_prefs.cc

diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc

index 52389b2693429682c1604fba9e60a22486cdeac7..611914f11807a4c691f00610ddba3b6e07de032a 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