Add new app banner metrics using InstallableStatusCode.

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/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"
 
@@ skipping 335 matching lines @@
   std::unique_ptr<base::DictionaryValue> value(new base::DictionaryValue());
   value->SetDouble(kBannerTimeKey, time.ToInternalValue());
   value->SetDouble(kBannerEngagementKey, engagement);
   could_show_list->Append(std::move(value));
 
   settings->SetWebsiteSettingDefaultScope(
       origin_url, GURL(), CONTENT_SETTINGS_TYPE_APP_BANNER, std::string(),
       std::move(origin_dict));
 }
 
-bool AppBannerSettingsHelper::ShouldShowBanner(
+InstallableStatusCode AppBannerSettingsHelper::ShouldShowBanner(
     content::WebContents* web_contents,
     const GURL& origin_url,
     const std::string& package_name_or_start_url,
     base::Time time) {
   // Ignore all checks if the flag to do so is set.
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kBypassAppBannerEngagementChecks)) {
-    return true;
+    return NO_ERROR_DETECTED;
   }
 
   // Never show a banner when the package name or URL is empty.
   if (package_name_or_start_url.empty())
-    return false;
+    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);
-    return false;
+    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);
-    return false;
+    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);
-    return false;
+    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())
-    return true;
+    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);
-    return false;
+    return INSUFFICIENT_ENGAGEMENT;
   }
 
-  return true;
+  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;
 
   Profile* profile =
@@ skipping 193 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");
 }