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 5f0e2fc915717ca337c1793058497b30c62f07ed..d6a0186ee40d35d8f7a58be38740a91b05993b2a 100644 |
--- a/chrome/browser/engagement/site_engagement_service.cc |
+++ b/chrome/browser/engagement/site_engagement_service.cc |
@@ -58,8 +58,7 @@ |
const double SiteEngagementScore::kMaxPoints = 100; |
const double SiteEngagementScore::kMaxPointsPerDay = 5; |
-const double SiteEngagementScore::kNavigationPoints = 0.5; |
-const double SiteEngagementScore::kUserInputPoints = 0.05; |
+const double SiteEngagementScore::kNavigationPoints = 1; |
const int SiteEngagementScore::kDecayPeriodInDays = 7; |
const double SiteEngagementScore::kDecayPoints = 5; |
@@ -168,32 +167,43 @@ |
SiteEngagementService::~SiteEngagementService() { |
} |
-void SiteEngagementService::HandleNavigation(const GURL& url, |
- ui::PageTransition transition) { |
- AddPoints(url, SiteEngagementScore::kNavigationPoints); |
-} |
- |
-void SiteEngagementService::HandleUserInput(const GURL& url) { |
- AddPoints(url, SiteEngagementScore::kUserInputPoints); |
-} |
- |
-double SiteEngagementService::GetScore(const GURL& url) { |
+void SiteEngagementService::HandleNavigation(const GURL& url) { |
HostContentSettingsMap* settings_map = |
HostContentSettingsMapFactory::GetForProfile(profile_); |
scoped_ptr<base::DictionaryValue> score_dict = |
GetScoreDictForOrigin(settings_map, url); |
SiteEngagementScore score(&clock_, *score_dict); |
+ score.AddPoints(SiteEngagementScore::kNavigationPoints); |
+ if (score.UpdateScoreDict(score_dict.get())) { |
+ ContentSettingsPattern pattern( |
+ ContentSettingsPattern::FromURLNoWildcard(url)); |
+ if (!pattern.IsValid()) |
+ return; |
+ |
+ settings_map->SetWebsiteSetting(pattern, ContentSettingsPattern::Wildcard(), |
+ CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, |
+ std::string(), score_dict.release()); |
+ } |
+} |
+ |
+int SiteEngagementService::GetScore(const GURL& url) { |
+ HostContentSettingsMap* settings_map = |
+ HostContentSettingsMapFactory::GetForProfile(profile_); |
+ scoped_ptr<base::DictionaryValue> score_dict = |
+ GetScoreDictForOrigin(settings_map, url); |
+ SiteEngagementScore score(&clock_, *score_dict); |
+ |
return score.Score(); |
} |
-double SiteEngagementService::GetTotalEngagementPoints() { |
+int SiteEngagementService::GetTotalEngagementPoints() { |
HostContentSettingsMap* settings_map = |
HostContentSettingsMapFactory::GetForProfile(profile_); |
ContentSettingsForOneType engagement_settings; |
settings_map->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, |
std::string(), &engagement_settings); |
- double total_score = 0; |
+ int total_score = 0; |
for (const auto& site : engagement_settings) { |
GURL origin(site.primary_pattern.ToString()); |
if (!origin.is_valid()) |
@@ -207,8 +217,8 @@ |
return total_score; |
} |
-std::map<GURL, double> SiteEngagementService::GetScoreMap() { |
- std::map<GURL, double> score_map; |
+std::map<GURL, int> SiteEngagementService::GetScoreMap() { |
+ std::map<GURL, int> score_map; |
HostContentSettingsMap* settings_map = |
HostContentSettingsMapFactory::GetForProfile(profile_); |
ContentSettingsForOneType engagement_settings; |
@@ -226,23 +236,3 @@ |
} |
return score_map; |
} |
- |
-void SiteEngagementService::AddPoints(const GURL& url, double points) { |
- HostContentSettingsMap* settings_map = |
- HostContentSettingsMapFactory::GetForProfile(profile_); |
- scoped_ptr<base::DictionaryValue> score_dict = |
- GetScoreDictForOrigin(settings_map, url); |
- SiteEngagementScore score(&clock_, *score_dict); |
- |
- score.AddPoints(points); |
- if (score.UpdateScoreDict(score_dict.get())) { |
- ContentSettingsPattern pattern( |
- ContentSettingsPattern::FromURLNoWildcard(url)); |
- if (!pattern.IsValid()) |
- return; |
- |
- settings_map->SetWebsiteSetting(pattern, ContentSettingsPattern::Wildcard(), |
- CONTENT_SETTINGS_TYPE_SITE_ENGAGEMENT, |
- std::string(), score_dict.release()); |
- } |
-} |