| Index: chrome/browser/banners/app_banner_manager.cc
|
| diff --git a/chrome/browser/banners/app_banner_manager.cc b/chrome/browser/banners/app_banner_manager.cc
|
| index b89fce34451f15a371aca8e04b2625dfdb6b60e4..8a08de6ebda0baa77c29edcd3bdff3a5c3e47a40 100644
|
| --- a/chrome/browser/banners/app_banner_manager.cc
|
| +++ b/chrome/browser/banners/app_banner_manager.cc
|
| @@ -71,10 +71,8 @@ void AppBannerManager::SetTimeDeltaForTesting(int days) {
|
| }
|
|
|
| // static
|
| -void AppBannerManager::SetEngagementWeights(double direct_engagement,
|
| - double indirect_engagement) {
|
| - AppBannerSettingsHelper::SetEngagementWeights(direct_engagement,
|
| - indirect_engagement);
|
| +void AppBannerManager::SetTotalEngagementToTrigger(double engagement) {
|
| + AppBannerSettingsHelper::SetTotalEngagementToTrigger(engagement);
|
| }
|
|
|
| // static
|
| @@ -362,8 +360,7 @@ void AppBannerManager::DidStartNavigation(content::NavigationHandle* handle) {
|
| return;
|
|
|
| load_finished_ = false;
|
| - if (AppBannerSettingsHelper::ShouldUseSiteEngagementScore() &&
|
| - GetSiteEngagementService() == nullptr) {
|
| + if (GetSiteEngagementService() == nullptr) {
|
| // Ensure that we are observing the site engagement service on navigation
|
| // start. This may be the first navigation, or we may have stopped
|
| // observing if the banner flow was triggered on the previous page.
|
| @@ -391,10 +388,9 @@ void AppBannerManager::DidFinishLoad(
|
|
|
| load_finished_ = true;
|
| validated_url_ = validated_url;
|
| - // Start the pipeline immediately if we aren't using engagement, or if 0
|
| - // engagement is required.
|
| - if (!AppBannerSettingsHelper::ShouldUseSiteEngagementScore() ||
|
| - banner_request_queued_ ||
|
| + // Start the pipeline immediately if 0 engagement is required or if we've
|
| + // queued a banner request.
|
| + if (banner_request_queued_ ||
|
| AppBannerSettingsHelper::HasSufficientEngagement(0)) {
|
| SiteEngagementObserver::Observe(nullptr);
|
| banner_request_queued_ = false;
|
| @@ -447,9 +443,9 @@ void AppBannerManager::RecordCouldShowBanner() {
|
| content::WebContents* contents = web_contents();
|
| DCHECK(contents);
|
|
|
| - AppBannerSettingsHelper::RecordBannerCouldShowEvent(
|
| + AppBannerSettingsHelper::RecordBannerEvent(
|
| contents, validated_url_, GetAppIdentifier(),
|
| - GetCurrentTime(), last_transition_type_);
|
| + AppBannerSettingsHelper::APP_BANNER_EVENT_COULD_SHOW, GetCurrentTime());
|
| }
|
|
|
| bool AppBannerManager::CheckIfShouldShowBanner() {
|
|
|