chrome/browser/policy/configuration_policy_handler_list_factory.cc - Issue 1150373002: platformKeys: Add policy and corporate key tagging.

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/policy/configuration_policy_handler_list_factory.cc

Issue 1150373002: platformKeys: Add policy and corporate key tagging. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@key_perm

Patch Set: Rebased. Created 5 years, 6 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chromeos/platform_keys/key_permissions_policy_handlers.cc ('K') | « chrome/browser/extensions/api/platform_keys/platform_keys_apitest_nss.cc ('k') | chrome/browser/prefs/browser_prefs.cc » ('j') | chrome/test/data/policy/policy_test_cases.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/configuration_policy_handler_list_factory.cc

diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc

index f117e04626de64ee1b52a4a4286f09ea9f79eebd..0f67df7d35f1bdd8b25562baa8ffe7dbf67dd918 100644

--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc

+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc

@@ -42,6 +42,7 @@

#endif

#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/platform_keys/key_permissions_policy_handlers.h"

#include "chrome/browser/chromeos/policy/configuration_policy_handler_chromeos.h"

#include "chromeos/chromeos_pref_names.h"

#include "chromeos/dbus/power_policy_controller.h"

@@ -775,6 +776,8 @@ scoped_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(

key::kSessionLocales, NULL, chrome_schema, SCHEMA_STRICT,

SimpleSchemaValidatingPolicyHandler::RECOMMENDED_ALLOWED,

SimpleSchemaValidatingPolicyHandler::MANDATORY_PROHIBITED)));

+ handlers->AddHandler(make_scoped_ptr(

+ new chromeos::KeyPermissionsPolicyHandler(chrome_schema)));

#endif // defined(OS_CHROMEOS)

return handlers.Pass();