Instant App Banner logic.

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>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "chrome/browser/android/instantapps/instant_apps_settings.h"
 #include "chrome/browser/banners/app_banner_manager.h"
 #include "chrome/browser/banners/app_banner_metrics.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/installable/installable_logging.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"
 #include "components/rappor/rappor_utils.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/web_contents.h"
 #include "net/base/escape.h"
 #include "url/gurl.h"
 
 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.
-const unsigned int kMinimumDaysBetweenBannerShows = 60;
+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;
@@ skipping 333 matching lines @@
   }
 
   // Never show a banner when the package name or URL is empty.
   if (package_name_or_start_url.empty())
     return PACKAGE_NAME_OR_START_URL_EMPTY;
 
   // Don't show if it has been added to the homescreen.
   base::Time added_time =
       GetSingleBannerEvent(web_contents, origin_url, package_name_or_start_url,
                            APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN);
-  if (!added_time.is_null()) {
-    banners::TrackDisplayEvent(banners::DISPLAY_EVENT_INSTALLED_PREVIOUSLY);
+  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)) {
-    banners::TrackDisplayEvent(banners::DISPLAY_EVENT_BLOCKED_PREVIOUSLY);
+      base::TimeDelta::FromDays(kMinimumBannerBlockedToBannerShown))
     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)) {
-    banners::TrackDisplayEvent(banners::DISPLAY_EVENT_IGNORED_PREVIOUSLY);
+      base::TimeDelta::FromDays(kMinimumDaysBetweenBannerShows))
     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.
-  if (ShouldUseSiteEngagementScore())
+  // Do not do engagement checks for instant app banners.
+  if (ShouldUseSiteEngagementScore() ||
+      package_name_or_start_url == InstantAppsSettings::kInstantAppsKey)
     return NO_ERROR_DETECTED;
 
   double total_engagement = 0;
   std::vector<BannerEvent> could_show_events = GetCouldShowBannerEvents(
       web_contents, origin_url, package_name_or_start_url);
 
   for (const auto& event : could_show_events)
     total_engagement += event.engagement;
 
-  if (!HasSufficientEngagement(total_engagement)) {
-    banners::TrackDisplayEvent(banners::DISPLAY_EVENT_NOT_VISITED_ENOUGH);
+  if (!HasSufficientEngagement(total_engagement))
     return INSUFFICIENT_ENGAGEMENT;
-  }
 
   return NO_ERROR_DETECTED;
 }
 
 std::vector<AppBannerSettingsHelper::BannerEvent>
 AppBannerSettingsHelper::GetCouldShowBannerEvents(
     content::WebContents* web_contents,
     const GURL& origin_url,
     const std::string& package_name_or_start_url) {
   std::vector<BannerEvent> result;
@@ skipping 104 matching lines @@
   // homescreen recently, return true.
   for (base::DictionaryValue::Iterator it(*origin_dict); !it.IsAtEnd();
        it.Advance()) {
     if (it.value().IsType(base::Value::TYPE_DICTIONARY)) {
       const base::DictionaryValue* value;
       it.value().GetAsDictionary(&value);
 
       std::string event_key(
           kBannerEventKeys[APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN]);
       double internal_time;
       if (!value->GetDouble(event_key, &internal_time))

[dominickn, 2016/09/29 07:22:05]

Change this if statement to:

if (it.key() == kInstantAppsKey || !value->GetDouble....)

For now, I think it's safest to just say that sites which have recorded an
instant app launch shouldn't be counted as a recent launch. I think that should
check the key correctly.

[Maria, 2016/09/30 17:24:41]

Nice catch!

         continue;
 
       base::Time added_time = base::Time::FromInternalValue(internal_time);
 
       if ((now - added_time) <=
           base::TimeDelta::FromDays(kRecentLastLaunchInDays)) {
         return true;
       }
     }
   }
@@ skipping 67 matching lines @@
     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");
 }