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

Unified Diff: chrome/browser/policy/user_policy_signin_service.cc

Issue 12310042: Do not initialize sync or policy on import process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Whitespace fix. Created 7 years, 10 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/policy/user_policy_signin_service.cc
diff --git a/chrome/browser/policy/user_policy_signin_service.cc b/chrome/browser/policy/user_policy_signin_service.cc
index 96c7a2e93de01bf22af13ce0d1611b0f482814bb..37fd193c98588966429af77cff667dfe71c2e453 100644
--- a/chrome/browser/policy/user_policy_signin_service.cc
+++ b/chrome/browser/policy/user_policy_signin_service.cc
@@ -6,6 +6,7 @@
#include <vector>
+#include "base/command_line.h"
#include "base/prefs/pref_service.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
@@ -16,6 +17,7 @@
#include "chrome/browser/policy/user_cloud_policy_manager_factory.h"
#include "chrome/browser/policy/user_info_fetcher.h"
#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/signin/signin_manager.h"
#include "chrome/browser/signin/signin_manager_factory.h"
#include "chrome/browser/signin/token_service.h"
@@ -217,8 +219,11 @@ void CloudPolicyClientRegistrationHelper::OnClientError(
UserPolicySigninService::UserPolicySigninService(
Profile* profile)
: profile_(profile) {
- 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,
« no previous file with comments | « no previous file | chrome/browser/sync/profile_sync_service_factory.cc » ('j') | chrome/browser/webdata/web_data_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698