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

Unified Diff: chrome/browser/chromeos/policy/device_local_account_policy_provider.cc

Issue 2714493002: Load DeviceLocalAccount policy and DeviceSettings immediately on restore after Chrome crash. (Closed)
Patch Set: wrap Validator in unique_ptr Created 3 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/chromeos/policy/device_local_account_policy_provider.cc
diff --git a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
index a13065e582404bccfc4044b673a7e760cc0c69ad..47d39b493160840adbbea2d68e81f89098c56e0f 100644
--- a/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
+++ b/chrome/browser/chromeos/policy/device_local_account_policy_provider.cc
@@ -45,7 +45,8 @@ DeviceLocalAccountPolicyProvider::~DeviceLocalAccountPolicyProvider() {
std::unique_ptr<DeviceLocalAccountPolicyProvider>
DeviceLocalAccountPolicyProvider::Create(
const std::string& user_id,
- DeviceLocalAccountPolicyService* device_local_account_policy_service) {
+ DeviceLocalAccountPolicyService* device_local_account_policy_service,
+ bool force_immediate_load) {
DeviceLocalAccount::Type type;
if (!device_local_account_policy_service ||
!IsDeviceLocalAccountUser(user_id, &type)) {
@@ -89,6 +90,9 @@ DeviceLocalAccountPolicyProvider::Create(
new DeviceLocalAccountPolicyProvider(user_id,
device_local_account_policy_service,
std::move(chrome_policy_overrides)));
+ // In case of restore-after-restart broker should already be initialized.
+ if (force_immediate_load && provider->GetBroker())
+ provider->GetBroker()->LoadImmediately();
return provider;
}

Powered by Google App Engine
This is Rietveld 408576698