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

Unified Diff: chrome/browser/content_settings/host_content_settings_map.cc

Issue 7275018: Make ExtensionContentSettingsStore refcounted. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments Created 9 years, 6 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/content_settings/host_content_settings_map.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map.cc b/chrome/browser/content_settings/host_content_settings_map.cc
index 0c6bf93a3b46ad8e1d4a4473a0c0fdf92f418c0a..226be160d002918414df87852c5036efef24109d 100644
--- a/chrome/browser/content_settings/host_content_settings_map.cc
+++ b/chrome/browser/content_settings/host_content_settings_map.cc
@@ -106,7 +106,7 @@ HostContentSettingsMap::HostContentSettingsMap(Profile* profile)
// |extension_service| can be NULL in unit tests.
content_settings_providers_.push_back(make_linked_ptr(
new content_settings::ExtensionProvider(
- profile,
+ this,
extension_service->GetExtensionContentSettingsStore(),
is_off_the_record_)));
}
@@ -522,6 +522,14 @@ bool HostContentSettingsMap::IsDefaultContentSettingManaged(
return false;
}
+void HostContentSettingsMap::ShutdownOnUIThread() {
+ for (ProviderIterator it = content_settings_providers_.begin();
+ it != content_settings_providers_.end();
+ ++it) {
+ (*it)->ShutdownOnUIThread();
+ }
+}
+
void HostContentSettingsMap::UnregisterObservers() {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (!profile_)

Powered by Google App Engine
This is Rietveld 408576698