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

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

Issue 9404011: Explicitly wait for user policy before completing login. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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/browser_policy_connector.cc
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index bb6a250db4c839c50a669977cfc864ef7c5ac106..3489dda25eeada6171ca054371d7aa7d54dadab8 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -258,7 +258,8 @@ void BrowserPolicyConnector::ScheduleServiceInitialization(
}
void BrowserPolicyConnector::InitializeUserPolicy(
const std::string& user_name,
- bool wait_for_policy_fetch) {
+ bool wait_for_policy_fetch,
+ const base::Closure& callback) {
// Throw away the old backend.
user_cloud_policy_subsystem_.reset();
user_policy_token_cache_.reset();
@@ -280,7 +281,8 @@ void BrowserPolicyConnector::InitializeUserPolicy(
UserPolicyCache* user_policy_cache =
new UserPolicyCache(policy_cache_dir.Append(kPolicyCacheFile),
- wait_for_policy_fetch);
+ wait_for_policy_fetch,
+ callback);
user_data_store_.reset(CloudPolicyDataStore::CreateForUserPolicies());
user_policy_token_cache_.reset(
new UserPolicyTokenCache(user_data_store_.get(),

Powered by Google App Engine
This is Rietveld 408576698