Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(118)

Unified Diff: trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc

Issue 15876003: Revert 201968 "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:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc
===================================================================
--- trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc (revision 201976)
+++ trunk/src/chrome/browser/policy/cloud/user_policy_signin_service.cc (working copy)
@@ -226,11 +226,8 @@
Profile* profile)
: profile_(profile),
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,
« no previous file with comments | « trunk/src/chrome/browser/importer/ie_importer_browsertest_win.cc ('k') | trunk/src/chrome/browser/profiles/profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698