chrome/browser/policy/cloud/user_policy_signin_service.cc - Issue 12670013: Out-of-process import on Windows.

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/cloud/user_policy_signin_service.cc

Issue 12670013: Out-of-process import on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge up to r196136 + modifications in extracted CLs Created 7 years, 8 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:

Index: chrome/browser/policy/cloud/user_policy_signin_service.cc

diff --git a/chrome/browser/policy/cloud/user_policy_signin_service.cc b/chrome/browser/policy/cloud/user_policy_signin_service.cc

index ad412ad55fc92d1d9793b77df53757eb0b5c9834..d51a50b369e804af47624c136531e5a5b4f3c776 100644

--- a/chrome/browser/policy/cloud/user_policy_signin_service.cc

+++ b/chrome/browser/policy/cloud/user_policy_signin_service.cc

@@ -226,11 +226,8 @@ UserPolicySigninService::UserPolicySigninService(

Profile* profile)

: profile_(profile),

ALLOW_THIS_IN_INITIALIZER_LIST(weak_factory_(this)) {

- CommandLine* cmd_line = CommandLine::ForCurrentProcess();

- if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin) ||

- ProfileManager::IsImportProcess(*cmd_line)) {

+ if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin))

return;

- }

// Initialize/shutdown the UserCloudPolicyManager when the user signs out.

registrar_.Add(this,