chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc - Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 8 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

« chrome/browser/chromeos/login/login_utils_browsertest.cc ('K') | « chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h ('k') | chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc » ('j') | chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

index dc0bfbd20ccbb6b0b2b6f430ed5e6422a32bfae3..5fa7bb37aced3db8b572642dcbaf6757f240f471 100644

--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

@@ -104,6 +104,11 @@ void DeviceCloudPolicyManagerChromeOS::CancelEnrollment() {

}

+void DeviceCloudPolicyManagerChromeOS::Shutdown() {

+ CloudPolicyManager::Shutdown();

+ device_status_provider_.reset();

void DeviceCloudPolicyManagerChromeOS::OnStoreLoaded(CloudPolicyStore* store) {

CloudPolicyManager::OnStoreLoaded(store);