chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc - Issue 138163015: More fixes to enable ios build with policy.

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 138163015: More fixes to enable ios build with policy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: removed obsolete files from gyp Created 6 years, 11 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

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 157cae01bd4ade8aadcd203eaee078a38a447697..24ef44dfa58404d294f21762aac50b6d16f5506c 100644

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

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

@@ -128,9 +128,11 @@

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

#else

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

+#if !defined(OS_IOS)

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

#endif

+#endif

#if defined(ENABLE_MANAGED_USERS)

#include "chrome/browser/managed_mode/managed_user_service_factory.h"

@@ -351,8 +353,10 @@ EnsureBrowserContextKeyedServiceFactoriesBuilt() {

policy::UserNetworkConfigurationUpdaterFactory::GetInstance();

#else

policy::UserCloudPolicyManagerFactory::GetInstance();

+#if !defined(OS_IOS)

policy::UserPolicySigninServiceFactory::GetInstance();

#endif

+#endif

policy::PolicyHeaderServiceFactory::GetInstance();

policy::SchemaRegistryServiceFactory::GetInstance();

policy::UserCloudPolicyInvalidatorFactory::GetInstance();

« no previous file with comments | « chrome/browser/policy/policy_helpers.cc ('k') | chrome/browser/profiles/profile_io_data.h » ('j') | no next file with comments »