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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/supervised_user/supervised_user_pref_store.cc

Issue 1312453005: Removed Profile::GetHostContentSettingsMap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed patch conflict Created 5 years, 3 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
« no previous file with comments | « chrome/browser/storage/durable_storage_permission_context_factory.cc ('k') | chrome/browser/supervised_user/supervised_user_settings_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/supervised_user/supervised_user_pref_store.cc
diff --git a/chrome/browser/supervised_user/supervised_user_pref_store.cc b/chrome/browser/supervised_user/supervised_user_pref_store.cc
index 088f2bc03e61b51ddf49a50f68605ab88520a40e..376bacbc9543f8f80c8af4a8b0f0906d7c5afc93 100644
--- a/chrome/browser/supervised_user/supervised_user_pref_store.cc
+++ b/chrome/browser/supervised_user/supervised_user_pref_store.cc
@@ -70,8 +70,9 @@ SupervisedUserPrefStore::SupervisedUserPrefStore(
base::Unretained(this)));
// Should only be nullptr in unit tests
- // TODO(peconn): Remove this notification once HostContentSettingsMap is
- // a KeyedService.
+ // TODO(peconn): Remove this once SupervisedUserPrefStore is (partially at
+ // least) a KeyedService. The user_settings_subscription_ must be reset or
+ // destroyed before the SupervisedUserSettingsService is.
if (supervised_user_settings_service->GetProfile() != nullptr){
unsubscriber_registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
content::Source<Profile>(
« no previous file with comments | « chrome/browser/storage/durable_storage_permission_context_factory.cc ('k') | chrome/browser/supervised_user/supervised_user_settings_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698