chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc - Issue 56623005: Policy providers all get a SchemaRegistry to work with.

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

Issue 56623005: Policy providers all get a SchemaRegistry to work with. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@chrome-policy-schema-9-purge-with-callback

Patch Set: rebase Created 7 years, 1 month 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

« no previous file with comments | « chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_unittest.cc ('k') | chrome/browser/chromeos/system/tray_accessibility_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

index a8fdf59e033494100030212289cf25418048cd79..4f43f89a47a13fe32b39bdad5df52955cdb9c9fe 100644

--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.cc

@@ -24,6 +24,8 @@

#include "chrome/browser/policy/cloud/cloud_external_data_manager.h"

#include "chrome/browser/policy/cloud/device_management_service.h"

#include "chrome/browser/policy/cloud/resource_cache.h"

+#include "chrome/browser/policy/schema_registry_service.h"

+#include "chrome/browser/policy/schema_registry_service_factory.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/common/chrome_switches.h"

#include "chromeos/chromeos_paths.h"

@@ -87,7 +89,9 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>

UserCloudPolicyManagerFactoryChromeOS::UserCloudPolicyManagerFactoryChromeOS()

: BrowserContextKeyedBaseFactory(

"UserCloudPolicyManagerChromeOS",

- BrowserContextDependencyManager::GetInstance()) {}

+ BrowserContextDependencyManager::GetInstance()) {

+ DependsOn(SchemaRegistryServiceFactory::GetInstance());

UserCloudPolicyManagerFactoryChromeOS::

~UserCloudPolicyManagerFactoryChromeOS() {}

@@ -193,7 +197,7 @@ scoped_ptr<UserCloudPolicyManagerChromeOS>

resource_cache.Pass(),

wait_for_initial_policy,

base::TimeDelta::FromSeconds(kInitialPolicyFetchTimeoutSeconds)));

- manager->Init();

+ manager->Init(SchemaRegistryServiceFactory::GetForContext(profile));

manager->Connect(g_browser_process->local_state(),

device_management_service,

g_browser_process->system_request_context(),