chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - Issue 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService.

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 24153012: Fix cyclic dependency between ProfilePolicyConnector and PrefService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix/Extend NetworkConfigurationUpdater unit test. 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

« chrome/browser/chromeos/policy/network_policy_service_factory.cc ('K') | « chrome/browser/policy/profile_policy_connector_stub.cc ('k') | chrome/browser/profiles/off_the_record_profile_io_data.cc » ('j') | chrome/browser/ui/toolbar/toolbar_model_unittest.cc » ('J')
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 a7041148ca3ff4dbfdb9ca18796ef20407008ca3..d76eac7fc205e8a0e8a0b92b594ba13abf76a9dc 100644

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

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

@@ -116,6 +116,7 @@

#if defined(ENABLE_CONFIGURATION_POLICY)

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

#if defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/policy/network_policy_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"

@@ -331,6 +332,7 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

policy::ProfilePolicyConnectorFactory::GetInstance();

#if defined(ENABLE_CONFIGURATION_POLICY)

#if defined(OS_CHROMEOS)

+ policy::NetworkPolicyServiceFactory::GetInstance();

policy::RecommendationRestorerFactory::GetInstance();

policy::UserCloudPolicyManagerFactoryChromeOS::GetInstance();

policy::UserCloudPolicyTokenForwarderFactory::GetInstance();