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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 60683002: Revert 233048 "Support policies referencing external data for de..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « trunk/src/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc ('k') | trunk/src/chrome/browser/policy/cloud/cloud_external_data_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/chrome/browser/policy/browser_policy_connector.cc
===================================================================
--- trunk/src/chrome/browser/policy/browser_policy_connector.cc (revision 233050)
+++ trunk/src/chrome/browser/policy/browser_policy_connector.cc (working copy)
@@ -307,11 +307,7 @@
chromeos::DeviceSettingsService::Get(),
chromeos::CrosSettings::Get(),
GetBackgroundTaskRunner(),
- GetBackgroundTaskRunner(),
- GetBackgroundTaskRunner(),
- content::BrowserThread::GetMessageLoopProxyForThread(
- content::BrowserThread::IO),
- request_context));
+ GetBackgroundTaskRunner()));
device_local_account_policy_service_->Connect(
device_management_service_.get());
}
@@ -362,7 +358,7 @@
if (device_cloud_policy_manager_)
device_cloud_policy_manager_->Shutdown();
if (device_local_account_policy_service_)
- device_local_account_policy_service_->Shutdown();
+ device_local_account_policy_service_->Disconnect();
global_user_cloud_policy_provider_.Shutdown();
#endif
« no previous file with comments | « trunk/src/chrome/browser/chromeos/policy/user_cloud_external_data_manager_browsertest.cc ('k') | trunk/src/chrome/browser/policy/cloud/cloud_external_data_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698