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

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

Issue 25242002: Support policies referencing external data for device-local accounts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased. Created 7 years, 1 month 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 a405c31a861cf428f09d6f0cdaba313525195dbc..b79342d9a5fc22739333e467e8a26daf9e0378c2 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -307,7 +307,11 @@ void BrowserPolicyConnector::Init(
chromeos::DeviceSettingsService::Get(),
chromeos::CrosSettings::Get(),
GetBackgroundTaskRunner(),
- GetBackgroundTaskRunner()));
+ GetBackgroundTaskRunner(),
+ GetBackgroundTaskRunner(),
+ content::BrowserThread::GetMessageLoopProxyForThread(
+ content::BrowserThread::IO),
+ request_context));
device_local_account_policy_service_->Connect(
device_management_service_.get());
}
@@ -358,7 +362,7 @@ void BrowserPolicyConnector::Shutdown() {
if (device_cloud_policy_manager_)
device_cloud_policy_manager_->Shutdown();
if (device_local_account_policy_service_)
- device_local_account_policy_service_->Disconnect();
+ device_local_account_policy_service_->Shutdown();
global_user_cloud_policy_provider_.Shutdown();
#endif

Powered by Google App Engine
This is Rietveld 408576698