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

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

Issue 10854213: Added UserCloudPolicyManager::ShutdownAndRemovePolicy() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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/user_cloud_policy_manager.cc
diff --git a/chrome/browser/policy/user_cloud_policy_manager.cc b/chrome/browser/policy/user_cloud_policy_manager.cc
index 84f4c67dae68dcfe0ffdf1f54ac724870c0bc8b0..5b70cb30b7b72f37889a45d01b3af6254f1bc944 100644
--- a/chrome/browser/policy/user_cloud_policy_manager.cc
+++ b/chrome/browser/policy/user_cloud_policy_manager.cc
@@ -95,12 +95,9 @@ void UserCloudPolicyManager::Initialize(PrefService* prefs,
}
}
-void UserCloudPolicyManager::Shutdown() {
- refresh_scheduler_.reset();
- if (service_.get())
- service_->client()->RemoveObserver(this);
- service_.reset();
- prefs_ = NULL;
+void UserCloudPolicyManager::ShutdownAndRemovePolicy() {
+ Shutdown();
+ store_->Clear();
}
void UserCloudPolicyManager::CancelWaitForPolicyFetch() {
@@ -196,4 +193,12 @@ void UserCloudPolicyManager::OnRefreshComplete() {
CheckAndPublishPolicy();
}
+void UserCloudPolicyManager::Shutdown() {
+ refresh_scheduler_.reset();
+ if (service_.get())
+ service_->client()->RemoveObserver(this);
+ service_.reset();
+ prefs_ = NULL;
+}
+
} // namespace policy
« no previous file with comments | « chrome/browser/policy/user_cloud_policy_manager.h ('k') | chrome/browser/policy/user_cloud_policy_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698