chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - Issue 2606773002: Setup Chromad user policy plumbing

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/profiles/chrome_browser_main_extra_parts_profiles.cc

Issue 2606773002: Setup Chromad user policy plumbing (Closed)

Patch Set: Address remaining comments Created 4 years 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/policy/profile_policy_connector_factory.cc ('K') | « chrome/browser/policy/profile_policy_connector_unittest.cc ('k') | chrome/browser/profiles/profile_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

index 66ec1815426836a1c7bf307c9fb6fd8fc8ea531c..8183f8dc32ff225bad9b510a674bb43af0160fb6 100644

--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc

@@ -98,9 +98,9 @@

#include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"

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

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

-#include "chrome/browser/chromeos/policy/user_cloud_policy_manager_factory_chromeos.h"

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

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

+#include "chrome/browser/chromeos/policy/user_policy_manager_factory_chromeos.h"

#else

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

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

@@ -302,7 +302,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

chromeos::OwnerSettingsServiceChromeOSFactory::GetInstance();

policy::PolicyCertServiceFactory::GetInstance();

policy::RecommendationRestorerFactory::GetInstance();

- policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance();

+ policy::UserPolicyManagerFactoryChromeOS::GetInstance();

policy::UserCloudPolicyTokenForwarderFactory::GetInstance();

policy::UserNetworkConfigurationUpdaterFactory::GetInstance();

#else // !defined(OS_CHROMEOS)