chrome/browser/engagement/site_engagement_service.cc - Issue 1312453005: Removed Profile::GetHostContentSettingsMap

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Removed Notification Subscription from SupervisedProvider 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/download/download_request_limiter.cc ('k') | chrome/browser/engagement/site_engagement_service_factory.cc » ('j') | chrome/browser/notifications/notification_permission_context_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..332bb338f127714ee2f2b14baeaac76a18ed9aba 100644

--- a/chrome/browser/engagement/site_engagement_service.cc

+++ b/chrome/browser/engagement/site_engagement_service.cc

@@ -10,6 +10,7 @@

#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"

@@ -168,7 +169,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 +189,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 +199,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);