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

Unified Diff: chrome/browser/content_settings/cookie_settings_factory.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
Index: chrome/browser/content_settings/cookie_settings_factory.cc
diff --git a/chrome/browser/content_settings/cookie_settings_factory.cc b/chrome/browser/content_settings/cookie_settings_factory.cc
index 09c68c81ac592f73897bb88d16c27334fbe8fb84..6d7ce974c3b675261e43fc337beffadc135c3a9e 100644
--- a/chrome/browser/content_settings/cookie_settings_factory.cc
+++ b/chrome/browser/content_settings/cookie_settings_factory.cc
@@ -6,6 +6,7 @@
#include "base/logging.h"
#include "base/prefs/pref_service.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/profiles/incognito_helpers.h"
#include "chrome/browser/profiles/profile.h"
#include "components/content_settings/core/browser/cookie_settings.h"
@@ -35,6 +36,7 @@ CookieSettingsFactory::CookieSettingsFactory()
: RefcountedBrowserContextKeyedServiceFactory(
"CookieSettings",
BrowserContextDependencyManager::GetInstance()) {
+ DependsOn(HostContentSettingsMapFactory::GetInstance());
}
CookieSettingsFactory::~CookieSettingsFactory() {
@@ -63,6 +65,7 @@ CookieSettingsFactory::BuildServiceInstanceFor(
UserMetricsAction("ThirdPartyCookieBlockingDisabled"));
}
return new content_settings::CookieSettings(
- profile->GetHostContentSettingsMap(), profile->GetPrefs(),
+ HostContentSettingsMapFactory::GetForProfile(profile),
+ profile->GetPrefs(),
extensions::kExtensionScheme);
}

Powered by Google App Engine
This is Rietveld 408576698