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

Unified Diff: chrome/browser/engagement/site_engagement_service.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/engagement/site_engagement_service.cc
diff --git a/chrome/browser/engagement/site_engagement_service.cc b/chrome/browser/engagement/site_engagement_service.cc
index 5f36f19ba525753cb54e04c913119451d858a8fa..b4e29444b6ea627e489b907bd8ed6e6d735afd37 100644
--- a/chrome/browser/engagement/site_engagement_service.cc
+++ b/chrome/browser/engagement/site_engagement_service.cc
@@ -10,9 +10,9 @@
#include "base/command_line.h"
#include "base/time/clock.h"
#include "base/values.h"
+#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/engagement/site_engagement_helper.h"
#include "chrome/browser/engagement/site_engagement_service_factory.h"
-#include "chrome/browser/profiles/profile.h"
#include "chrome/common/chrome_switches.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
#include "components/content_settings/core/common/content_settings_pattern.h"
@@ -168,7 +168,8 @@ SiteEngagementService::~SiteEngagementService() {
}
void SiteEngagementService::HandleNavigation(const GURL& url) {
- HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
+ HostContentSettingsMap* settings_map =
+ HostContentSettingsMapFactory::GetForProfile(profile_);
scoped_ptr<base::DictionaryValue> score_dict =
GetScoreDictForOrigin(settings_map, url);
SiteEngagementScore score(&clock_, *score_dict);
@@ -187,7 +188,8 @@ void SiteEngagementService::HandleNavigation(const GURL& url) {
}
int SiteEngagementService::GetScore(const GURL& url) {
- HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
+ HostContentSettingsMap* settings_map =
+ HostContentSettingsMapFactory::GetForProfile(profile_);
scoped_ptr<base::DictionaryValue> score_dict =
GetScoreDictForOrigin(settings_map, url);
SiteEngagementScore score(&clock_, *score_dict);
@@ -196,7 +198,8 @@ int SiteEngagementService::GetScore(const GURL& url) {
}
int SiteEngagementService::GetTotalEngagementPoints() {
- HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
+ HostContentSettingsMap* settings_map =
+ HostContentSettingsMapFactory::GetForProfile(profile_);
ContentSettingsForOneType engagement_settings;
settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT,
std::string(), &engagement_settings);
« no previous file with comments | « chrome/browser/download/download_request_limiter.cc ('k') | chrome/browser/engagement/site_engagement_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698