From 900bbb50c78ce14249268dc00c4ed0af34a7410c Mon Sep 17 00:00:00 2001 From: Emerick Rogul Date: Thu, 11 Nov 2021 11:42:18 -0500 Subject: [PATCH] Hide Later button in adaptive captcha notification instead of disabling it --- browser/brave_ads/tooltips/ads_tooltips_controller.cc | 9 +++++---- browser/brave_ads/tooltips/ads_tooltips_controller.h | 2 +- browser/brave_ads/tooltips/ads_tooltips_delegate_impl.cc | 4 ++-- browser/brave_ads/tooltips/ads_tooltips_delegate_impl.h | 2 +- components/brave_ads/browser/ads_tooltips_delegate.h | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/browser/brave_ads/tooltips/ads_tooltips_controller.cc b/browser/brave_ads/tooltips/ads_tooltips_controller.cc index 456eda1018a5..818fd5293a7f 100644 --- a/browser/brave_ads/tooltips/ads_tooltips_controller.cc +++ b/browser/brave_ads/tooltips/ads_tooltips_controller.cc @@ -27,7 +27,7 @@ AdsTooltipsController::~AdsTooltipsController() = default; void AdsTooltipsController::ShowCaptchaTooltip( const std::string& payment_id, const std::string& captcha_id, - bool enable_cancel_button, + bool include_cancel_button, ShowScheduledCaptchaCallback show_captcha_callback, SnoozeScheduledCaptchaCallback snooze_captcha_callback) { const std::u16string title = l10n_util::GetStringUTF16( @@ -36,12 +36,13 @@ void AdsTooltipsController::ShowCaptchaTooltip( IDS_BRAVE_ADS_SCHEDULED_CAPTCHA_NOTIFICATION_BODY); const std::u16string ok_button_text = l10n_util::GetStringUTF16( IDS_BRAVE_ADS_SCHEDULED_CAPTCHA_NOTIFICATION_OK_BUTTON_TEXT); - const std::u16string cancel_button_text = l10n_util::GetStringUTF16( + std::u16string cancel_button_text = l10n_util::GetStringUTF16( IDS_BRAVE_ADS_SCHEDULED_CAPTCHA_NOTIFICATION_CANCEL_BUTTON_TEXT); brave_tooltips::BraveTooltipAttributes tooltip_attributes( - title, body, ok_button_text, cancel_button_text); - tooltip_attributes.set_cancel_button_enabled(enable_cancel_button); + title, body, ok_button_text, + include_cancel_button ? cancel_button_text : u""); + tooltip_attributes.set_cancel_button_enabled(include_cancel_button); auto captcha_tooltip = std::make_unique( std::move(show_captcha_callback), std::move(snooze_captcha_callback), tooltip_attributes, payment_id, captcha_id); diff --git a/browser/brave_ads/tooltips/ads_tooltips_controller.h b/browser/brave_ads/tooltips/ads_tooltips_controller.h index 976ae82dac6e..c98ee41fa503 100644 --- a/browser/brave_ads/tooltips/ads_tooltips_controller.h +++ b/browser/brave_ads/tooltips/ads_tooltips_controller.h @@ -29,7 +29,7 @@ class AdsTooltipsController : public AdsTooltipsDelegate, void ShowCaptchaTooltip( const std::string& payment_id, const std::string& captcha_id, - bool enable_cancel_button, + bool include_cancel_button, ShowScheduledCaptchaCallback show_captcha_callback, SnoozeScheduledCaptchaCallback snooze_captcha_callback) override; void CloseCaptchaTooltip() override; diff --git a/browser/brave_ads/tooltips/ads_tooltips_delegate_impl.cc b/browser/brave_ads/tooltips/ads_tooltips_delegate_impl.cc index 5b3cabf3b2cf..33714e2ec883 100644 --- a/browser/brave_ads/tooltips/ads_tooltips_delegate_impl.cc +++ b/browser/brave_ads/tooltips/ads_tooltips_delegate_impl.cc @@ -18,11 +18,11 @@ AdsTooltipsDelegateImpl::AdsTooltipsDelegateImpl(Profile* profile) void AdsTooltipsDelegateImpl::ShowCaptchaTooltip( const std::string& payment_id, const std::string& captcha_id, - bool enable_cancel_button, + bool include_cancel_button, ShowScheduledCaptchaCallback show_captcha_callback, SnoozeScheduledCaptchaCallback snooze_captcha_callback) { ads_tooltips_controller_.ShowCaptchaTooltip( - payment_id, captcha_id, enable_cancel_button, + payment_id, captcha_id, include_cancel_button, std::move(show_captcha_callback), std::move(snooze_captcha_callback)); } diff --git a/browser/brave_ads/tooltips/ads_tooltips_delegate_impl.h b/browser/brave_ads/tooltips/ads_tooltips_delegate_impl.h index 6a0da6ba3b5f..5f8dd2a8495d 100644 --- a/browser/brave_ads/tooltips/ads_tooltips_delegate_impl.h +++ b/browser/brave_ads/tooltips/ads_tooltips_delegate_impl.h @@ -26,7 +26,7 @@ class AdsTooltipsDelegateImpl : public AdsTooltipsDelegate { void ShowCaptchaTooltip( const std::string& payment_id, const std::string& captcha_id, - bool enable_cancel_button, + bool include_cancel_button, ShowScheduledCaptchaCallback show_captcha_callback, SnoozeScheduledCaptchaCallback snooze_captcha_callback) override; void CloseCaptchaTooltip() override; diff --git a/components/brave_ads/browser/ads_tooltips_delegate.h b/components/brave_ads/browser/ads_tooltips_delegate.h index 2c5718323e5e..ca92bab2def3 100644 --- a/components/brave_ads/browser/ads_tooltips_delegate.h +++ b/components/brave_ads/browser/ads_tooltips_delegate.h @@ -22,7 +22,7 @@ class AdsTooltipsDelegate { virtual void ShowCaptchaTooltip( const std::string& payment_id, const std::string& captcha_id, - bool enable_cancel_button, + bool include_cancel_button, ShowScheduledCaptchaCallback show_captcha_callback, SnoozeScheduledCaptchaCallback snooze_captcha_callback) = 0;