Allow variations controls for the time banners are suppressed after ignore/dismiss.

chrome/browser/banners/app_banner_settings_helper.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 21 matching lines @@
 
 namespace {
 
 // Max number of apps (including ServiceWorker based web apps) that a particular
 // site may show a banner for.
 const size_t kMaxAppsPerSite = 3;
 
 // Oldest could show banner event we care about, in days.
 const unsigned int kOldestCouldShowBannerEventInDays = 14;
 
-// Number of days that showing the banner will prevent it being seen again for.
+// Default number of days that dismissing or ignoring the banner will prevent it
+// being seen again for.
+const unsigned int kMinimumBannerBlockedToBannerShown = 90;
 const unsigned int kMinimumDaysBetweenBannerShows = 14;
 
 const unsigned int kNumberOfMinutesInADay = 1440;
 
-// Number of days that the banner being blocked will prevent it being seen again
-// for.
-const unsigned int kMinimumBannerBlockedToBannerShown = 90;
-
 // Default scores assigned to direct and indirect navigations respectively.
 const unsigned int kDefaultDirectNavigationEngagement = 1;
 const unsigned int kDefaultIndirectNavigationEngagement = 1;
 
 // Default number of navigations required to trigger the banner.
 const unsigned int kDefaultTotalEngagementToTrigger = 2;
 
 // The number of days in the past that a site should be launched from homescreen
 // to be considered recent.
 // TODO(dominickn): work out how to unify this with
@@ skipping 12 matching lines @@
 const char kBannerTimeKey[] = "time";
 const char kBannerEngagementKey[] = "engagement";
 
 // Keys to use when querying the variations params.
 const char kBannerParamsKey[] = "AppBannerTriggering";
 const char kBannerParamsDirectKey[] = "direct";
 const char kBannerParamsIndirectKey[] = "indirect";
 const char kBannerParamsTotalKey[] = "total";
 const char kBannerParamsMinutesKey[] = "minutes";
 const char kBannerParamsEngagementTotalKey[] = "site_engagement_total";
+const char kBannerParamsDaysAfterBannerDismissedKey[] = "days_after_dismiss";
+const char kBannerParamsDaysAfterBannerIgnoredKey[] = "days_after_ignore";
 const char kBannerSiteEngagementParamsKey[] = "use_site_engagement";
 
 // Engagement weight assigned to direct and indirect navigations.
 // By default, a direct navigation is a page visit via ui::PAGE_TRANSITION_TYPED
 // or ui::PAGE_TRANSITION_GENERATED.
 double gDirectNavigationEngagement = kDefaultDirectNavigationEngagement;
 double gIndirectNavigationEnagagement = kDefaultIndirectNavigationEngagement;
 
 // Number of minutes between visits that will trigger a could show banner event.
 // Defaults to the number of minutes in a day.
 unsigned int gMinimumMinutesBetweenVisits = kNumberOfMinutesInADay;
 
 // Total engagement score required before a banner will actually be triggered.
 double gTotalEngagementToTrigger = kDefaultTotalEngagementToTrigger;
 
+unsigned int gDaysAfterDismissedToShow = kMinimumBannerBlockedToBannerShown;
+unsigned int gDaysAfterIgnoredToShow = kMinimumDaysBetweenBannerShows;
+
 std::unique_ptr<base::DictionaryValue> GetOriginDict(
     HostContentSettingsMap* settings,
     const GURL& origin_url) {
   if (!settings)
     return base::MakeUnique<base::DictionaryValue>();
 
   std::unique_ptr<base::DictionaryValue> dict =
       base::DictionaryValue::From(settings->GetWebsiteSetting(
           origin_url, origin_url, CONTENT_SETTINGS_TYPE_APP_BANNER,
           std::string(), NULL));
@@ skipping 22 matching lines @@
   if (ui::PageTransitionCoreTypeIs(transition_type,
                                    ui::PAGE_TRANSITION_TYPED) ||
       ui::PageTransitionCoreTypeIs(transition_type,
                                    ui::PAGE_TRANSITION_GENERATED)) {
     return gDirectNavigationEngagement;
   } else {
     return gIndirectNavigationEnagagement;
   }
 }
 
+// Queries variations for the number of days which dismissing and ignoring the
+// banner should prevent a banner from showing.
+void UpdateDaysBetweenShowing() {
+  std::string dismiss_param = variations::GetVariationParamValue(
+      kBannerParamsKey, kBannerParamsDaysAfterBannerDismissedKey);
+  std::string ignore_param = variations::GetVariationParamValue(
+      kBannerParamsKey, kBannerParamsDaysAfterBannerIgnoredKey);
+
+  if (!dismiss_param.empty() && !ignore_param.empty()) {
+    unsigned int dismiss_days = 0;
+    unsigned int ignore_days = 0;
+
+    if (base::StringToUint(dismiss_param, &dismiss_days) &&
+        base::StringToUint(ignore_param, &ignore_days)) {
+      AppBannerSettingsHelper::SetDaysAfterDismissAndIgnoreToTrigger(
+          dismiss_days, ignore_days);
+    }
+  }
+}
+
 // Queries variations for the maximum site engagement score required to trigger
 // the banner showing.
 void UpdateSiteEngagementToTrigger() {
   std::string total_param = variations::GetVariationParamValue(
       kBannerParamsKey, kBannerParamsEngagementTotalKey);
 
   if (!total_param.empty()) {
     double total_engagement = -1;
 
     if (base::StringToDouble(total_param, &total_engagement) &&
@@ skipping 250 matching lines @@
   if (!added_time.is_null())
     return ALREADY_INSTALLED;
 
   base::Time blocked_time =
       GetSingleBannerEvent(web_contents, origin_url, package_name_or_start_url,
                            APP_BANNER_EVENT_DID_BLOCK);
 
   // Null times are in the distant past, so the delta between real times and
   // null events will always be greater than the limits.
   if (time - blocked_time <
-      base::TimeDelta::FromDays(kMinimumBannerBlockedToBannerShown)) {
+      base::TimeDelta::FromDays(gDaysAfterDismissedToShow)) {
     return PREVIOUSLY_BLOCKED;
   }
 
   base::Time shown_time =
       GetSingleBannerEvent(web_contents, origin_url, package_name_or_start_url,
                            APP_BANNER_EVENT_DID_SHOW);
-  if (time - shown_time <
-      base::TimeDelta::FromDays(kMinimumDaysBetweenBannerShows)) {
+  if (time - shown_time < base::TimeDelta::FromDays(gDaysAfterIgnoredToShow)) {
     return PREVIOUSLY_IGNORED;
   }
 
   // If we have gotten this far and want to use site engagement, the banner flow
   // was triggered by the site engagement service informing the banner manager
   // that sufficient engagement has been accumulated. Hence there is no need to
   // check the total amount of engagement.
   // TODO(dominickn): just return true here and remove all of the following code
   // in this method when app banners have fully migrated to using site
   // engagement as a trigger condition. See crbug.com/616322.
@@ skipping 146 matching lines @@
       if ((now - added_time) <=
           base::TimeDelta::FromDays(kRecentLastLaunchInDays)) {
         return true;
       }
     }
   }
 
   return false;
 }
 
+void AppBannerSettingsHelper::SetDaysAfterDismissAndIgnoreToTrigger(
+    unsigned int dismiss_days,
+    unsigned int ignore_days) {
+  gDaysAfterDismissedToShow = dismiss_days;
+  gDaysAfterIgnoredToShow = ignore_days;
+}
+
 void AppBannerSettingsHelper::SetEngagementWeights(double direct_engagement,
                                                    double indirect_engagement) {
   gDirectNavigationEngagement = direct_engagement;
   gIndirectNavigationEnagagement = indirect_engagement;
 }
 
 void AppBannerSettingsHelper::SetMinimumMinutesBetweenVisits(
     unsigned int minutes) {
   gMinimumMinutesBetweenVisits = minutes;
 }
 
 void AppBannerSettingsHelper::SetTotalEngagementToTrigger(
     double total_engagement) {
   gTotalEngagementToTrigger = total_engagement;
 }
 
 void AppBannerSettingsHelper::SetDefaultParameters() {
+  SetDaysAfterDismissAndIgnoreToTrigger(kMinimumBannerBlockedToBannerShown,
+                                        kMinimumDaysBetweenBannerShows);
   SetEngagementWeights(kDefaultDirectNavigationEngagement,
                        kDefaultIndirectNavigationEngagement);
   SetMinimumMinutesBetweenVisits(kNumberOfMinutesInADay);
   SetTotalEngagementToTrigger(kDefaultTotalEngagementToTrigger);
 }
 
 // Given a time, returns that time scoped to the nearest minute resolution
 // locally. For example, if the resolution is one hour, this function will
 // return the time to the closest (previous) hour in the local time zone.
 base::Time AppBannerSettingsHelper::BucketTimeToResolution(
@@ skipping 15 matching lines @@
   int total_minutes = exploded.hour * 60 + exploded.minute;
 
   // Use truncating integer division here.
   return time.LocalMidnight() +
          base::TimeDelta::FromMinutes((total_minutes / minutes) * minutes);
 }
 
 void AppBannerSettingsHelper::UpdateFromFieldTrial() {
   // If we are using the site engagement score, only extract the total
   // engagement to trigger from the params variations.
+  UpdateDaysBetweenShowing();
   if (ShouldUseSiteEngagementScore()) {
     UpdateSiteEngagementToTrigger();
   } else {
     UpdateEngagementWeights();
     UpdateMinutesBetweenVisits();
   }
 }
 
 bool AppBannerSettingsHelper::ShouldUseSiteEngagementScore() {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableSiteEngagementAppBanner)) {
     return true;
   }
 
   // Assume any value which is not "0" or "false" indicates that we should use
   // site engagement.
   std::string param = variations::GetVariationParamValue(
       kBannerParamsKey, kBannerSiteEngagementParamsKey);
 
   return (!param.empty() && param != "0" && param != "false");
 }