trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc - Issue 15968002: Revert 201837 "OOP 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: trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc

Issue 15968002: Revert 201837 "OOP import on Windows." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 7 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: trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc

===================================================================

--- trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc (revision 201967)

+++ trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc (working copy)

@@ -226,8 +226,11 @@

Profile* profile)

: profile_(profile),

weak_factory_(this) {

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

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

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

+ ProfileManager::IsImportProcess(*cmd_line)) {

return;

+ }

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

registrar_.Add(this,

Property changes on: trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc

___________________________________________________________________

Deleted: svn:mergeinfo