diff --git a/browser/brave_rewards/android/brave_rewards_native_worker.cc b/browser/brave_rewards/android/brave_rewards_native_worker.cc index 60627a973cbb..96412e91bab1 100644 --- a/browser/brave_rewards/android/brave_rewards_native_worker.cc +++ b/browser/brave_rewards/android/brave_rewards_native_worker.cc @@ -423,7 +423,7 @@ base::android::ScopedJavaLocalRef void BraveRewardsNativeWorker::GetPendingContributionsTotal(JNIEnv* env, const base::android::JavaParamRef& obj) { if (brave_rewards_service_) { - brave_rewards_service_->GetPendingContributionsTotalUI(base::Bind( + brave_rewards_service_->GetPendingContributionsTotal(base::Bind( &BraveRewardsNativeWorker::OnGetPendingContributionsTotal, weak_factory_.GetWeakPtr())); } @@ -432,7 +432,7 @@ void BraveRewardsNativeWorker::GetPendingContributionsTotal(JNIEnv* env, void BraveRewardsNativeWorker::GetRecurringDonations(JNIEnv* env, const base::android::JavaParamRef& obj) { if (brave_rewards_service_) { - brave_rewards_service_->GetRecurringTipsUI(base::Bind( + brave_rewards_service_->GetRecurringTips(base::Bind( &BraveRewardsNativeWorker::OnGetRecurringTips, weak_factory_.GetWeakPtr())); } @@ -546,7 +546,7 @@ void BraveRewardsNativeWorker::RemoveRecurring(JNIEnv* env, const base::android::JavaParamRef& obj, const base::android::JavaParamRef& publisher) { if (brave_rewards_service_) { - brave_rewards_service_->RemoveRecurringTipUI( + brave_rewards_service_->RemoveRecurringTip( base::android::ConvertJavaStringToUTF8(env, publisher)); } } diff --git a/browser/extensions/api/brave_rewards_api.cc b/browser/extensions/api/brave_rewards_api.cc index a648ef05ae6a..be2219b67728 100644 --- a/browser/extensions/api/brave_rewards_api.cc +++ b/browser/extensions/api/brave_rewards_api.cc @@ -559,7 +559,7 @@ BraveRewardsGetPendingContributionsTotalFunction::Run() { std::make_unique(0.0))); } - rewards_service->GetPendingContributionsTotalUI(base::Bind( + rewards_service->GetPendingContributionsTotal(base::Bind( &BraveRewardsGetPendingContributionsTotalFunction::OnGetPendingTotal, this)); return RespondLater(); @@ -675,7 +675,7 @@ BraveRewardsSaveRecurringTipFunction::Run() { return RespondNow(NoArguments()); } - rewards_service_->SaveRecurringTipUI( + rewards_service_->SaveRecurringTip( params->publisher_key, params->new_amount, base::Bind( @@ -707,7 +707,7 @@ BraveRewardsRemoveRecurringTipFunction::Run() { RewardsServiceFactory::GetForProfile(profile); if (rewards_service_) { - rewards_service_->RemoveRecurringTipUI(params->publisher_key); + rewards_service_->RemoveRecurringTip(params->publisher_key); } return RespondNow(NoArguments()); @@ -727,7 +727,7 @@ BraveRewardsGetRecurringTipsFunction::Run() { return RespondNow(Error("Rewards service is not initialized")); } - rewards_service->GetRecurringTipsUI(base::Bind( + rewards_service->GetRecurringTips(base::Bind( &BraveRewardsGetRecurringTipsFunction::OnGetRecurringTips, this)); return RespondLater(); diff --git a/browser/ui/webui/brave_rewards_page_ui.cc b/browser/ui/webui/brave_rewards_page_ui.cc index d090d2ba38fe..0a2b5302e20f 100644 --- a/browser/ui/webui/brave_rewards_page_ui.cc +++ b/browser/ui/webui/brave_rewards_page_ui.cc @@ -888,7 +888,7 @@ void RewardsDOMHandler::RestorePublishers(const base::ListValue *args) { return; } - rewards_service_->RestorePublishersUI(); + rewards_service_->RestorePublishers(); } void RewardsDOMHandler::RestorePublisher(const base::ListValue *args) { @@ -991,14 +991,14 @@ void RewardsDOMHandler::RemoveRecurringTip(const base::ListValue *args) { CHECK_EQ(1U, args->GetSize()); if (rewards_service_) { const std::string publisherKey = args->GetList()[0].GetString(); - rewards_service_->RemoveRecurringTipUI(publisherKey); + rewards_service_->RemoveRecurringTip(publisherKey); } } void RewardsDOMHandler::GetRecurringTips( const base::ListValue *args) { if (rewards_service_) { - rewards_service_->GetRecurringTipsUI(base::BindOnce( + rewards_service_->GetRecurringTips(base::BindOnce( &RewardsDOMHandler::OnGetRecurringTips, weak_factory_.GetWeakPtr())); } @@ -1060,7 +1060,7 @@ void RewardsDOMHandler::OnGetOneTimeTips( void RewardsDOMHandler::GetOneTimeTips(const base::ListValue *args) { if (rewards_service_) { - rewards_service_->GetOneTimeTipsUI(base::BindOnce( + rewards_service_->GetOneTimeTips(base::BindOnce( &RewardsDOMHandler::OnGetOneTimeTips, weak_factory_.GetWeakPtr())); } @@ -1322,7 +1322,7 @@ void RewardsDOMHandler::SetBackupCompleted(const base::ListValue *args) { void RewardsDOMHandler::GetPendingContributionsTotal( const base::ListValue* args) { if (rewards_service_) { - rewards_service_->GetPendingContributionsTotalUI(base::Bind( + rewards_service_->GetPendingContributionsTotal(base::Bind( &RewardsDOMHandler::OnGetPendingContributionsTotal, weak_factory_.GetWeakPtr())); } @@ -1452,7 +1452,7 @@ void RewardsDOMHandler::SetInlineTipSetting(const base::ListValue* args) { void RewardsDOMHandler::GetPendingContributions( const base::ListValue* args) { if (rewards_service_) { - rewards_service_->GetPendingContributionsUI(base::Bind( + rewards_service_->GetPendingContributions(base::Bind( &RewardsDOMHandler::OnGetPendingContributions, weak_factory_.GetWeakPtr())); } @@ -1496,13 +1496,13 @@ void RewardsDOMHandler::RemovePendingContribution( } const uint64_t id = args->GetList()[0].GetInt(); - rewards_service_->RemovePendingContributionUI(id); + rewards_service_->RemovePendingContribution(id); } void RewardsDOMHandler::RemoveAllPendingContributions( const base::ListValue* args) { if (rewards_service_) { - rewards_service_->RemoveAllPendingContributionsUI(); + rewards_service_->RemoveAllPendingContributions(); } } diff --git a/browser/ui/webui/brave_tip_ui.cc b/browser/ui/webui/brave_tip_ui.cc index 829f2970292c..446ce4a73053 100644 --- a/browser/ui/webui/brave_tip_ui.cc +++ b/browser/ui/webui/brave_tip_ui.cc @@ -237,7 +237,7 @@ void RewardsTipDOMHandler::OnTip(const base::ListValue* args) { void RewardsTipDOMHandler::GetRecurringTips( const base::ListValue *args) { if (rewards_service_) { - rewards_service_->GetRecurringTipsUI(base::BindOnce( + rewards_service_->GetRecurringTips(base::BindOnce( &RewardsTipDOMHandler::OnGetRecurringTips, weak_factory_.GetWeakPtr())); } diff --git a/components/brave_ads/browser/ads_service_impl_unittest.cc b/components/brave_ads/browser/ads_service_impl_unittest.cc index 40bc935803cf..4b3bf0c9bb68 100644 --- a/components/brave_ads/browser/ads_service_impl_unittest.cc +++ b/components/brave_ads/browser/ads_service_impl_unittest.cc @@ -56,7 +56,7 @@ class MockRewardsService : public RewardsService { MOCK_METHOD1(GetWalletPassphrase, void(const brave_rewards::GetWalletPassphraseCallback&)); MOCK_METHOD1(RecoverWallet, void(const std::string&)); - MOCK_METHOD0(RestorePublishersUI, void()); + MOCK_METHOD0(RestorePublishers, void()); MOCK_METHOD2(OnLoad, void(SessionID, const GURL&)); MOCK_METHOD1(OnUnload, void(SessionID)); MOCK_METHOD1(OnShow, void(SessionID)); @@ -112,10 +112,10 @@ class MockRewardsService : public RewardsService { double, bool, std::unique_ptr)); - MOCK_METHOD1(RemoveRecurringTipUI, void(const std::string&)); - MOCK_METHOD1(GetRecurringTipsUI, + MOCK_METHOD1(RemoveRecurringTip, void(const std::string&)); + MOCK_METHOD1(GetRecurringTips, void(brave_rewards::GetRecurringTipsCallback)); - MOCK_METHOD1(GetOneTimeTipsUI, void(brave_rewards::GetOneTimeTipsCallback)); + MOCK_METHOD1(GetOneTimeTips, void(brave_rewards::GetOneTimeTipsCallback)); MOCK_METHOD2(SetPublisherExclude, void(const std::string&, bool)); MOCK_CONST_METHOD0(GetNotificationService, brave_rewards::RewardsNotificationService*()); @@ -140,7 +140,7 @@ class MockRewardsService : public RewardsService { void(brave_rewards::GetRewardsInternalsInfoCallback)); MOCK_METHOD1(GetTransactionHistory, void(brave_rewards::GetTransactionHistoryCallback)); - MOCK_METHOD3(SaveRecurringTipUI, + MOCK_METHOD3(SaveRecurringTip, void(const std::string&, const double, brave_rewards::SaveRecurringTipCallback)); @@ -162,13 +162,10 @@ class MockRewardsService : public RewardsService { void(const std::string& type, const std::map& args, brave_rewards::GetShareURLCallback callback)); - MOCK_METHOD1(GetPendingContributionsUI, + MOCK_METHOD1(GetPendingContributions, void(brave_rewards::GetPendingContributionsCallback)); - MOCK_METHOD1(RemovePendingContributionUI, void(const uint64_t)); - MOCK_METHOD0(RemoveAllPendingContributionsUI, void()); - - MOCK_METHOD1(GetPendingContributionsTotalUI, void( - const brave_rewards::GetPendingContributionsTotalCallback& callback)); + MOCK_METHOD1(RemovePendingContribution, void(const uint64_t)); + MOCK_METHOD0(RemoveAllPendingContributions, void()); MOCK_METHOD1(FetchBalance, void( brave_rewards::FetchBalanceCallback callback)); diff --git a/components/brave_rewards/browser/rewards_service.h b/components/brave_rewards/browser/rewards_service.h index 3ba01e3db43f..d3007bf082ba 100644 --- a/components/brave_rewards/browser/rewards_service.h +++ b/components/brave_rewards/browser/rewards_service.h @@ -148,7 +148,7 @@ class RewardsService : public KeyedService { virtual void GetWalletPassphrase( const GetWalletPassphraseCallback& callback) = 0; virtual void RecoverWallet(const std::string& passPhrase) = 0; - virtual void RestorePublishersUI() = 0; + virtual void RestorePublishers() = 0; virtual void OnLoad(SessionID tab_id, const GURL& gurl) = 0; virtual void OnUnload(SessionID tab_id) = 0; virtual void OnShow(SessionID tab_id) = 0; @@ -213,9 +213,9 @@ class RewardsService : public KeyedService { const bool recurring, std::unique_ptr site) = 0; - virtual void RemoveRecurringTipUI(const std::string& publisher_key) = 0; - virtual void GetRecurringTipsUI(GetRecurringTipsCallback callback) = 0; - virtual void GetOneTimeTipsUI(GetOneTimeTipsCallback callback) = 0; + virtual void RemoveRecurringTip(const std::string& publisher_key) = 0; + virtual void GetRecurringTips(GetRecurringTipsCallback callback) = 0; + virtual void GetOneTimeTips(GetOneTimeTipsCallback callback) = 0; virtual void SetPublisherExclude( const std::string& publisher_key, bool exclude) = 0; @@ -223,7 +223,7 @@ class RewardsService : public KeyedService { virtual void SetBackupCompleted() = 0; virtual void GetAutoContributeProps( const GetAutoContributePropsCallback& callback) = 0; - virtual void GetPendingContributionsTotalUI( + virtual void GetPendingContributionsTotal( const GetPendingContributionsTotalCallback& callback) = 0; virtual void GetRewardsMainEnabled( const GetRewardsMainEnabledCallback& callback) const = 0; @@ -252,11 +252,11 @@ class RewardsService : public KeyedService { const std::string& publisher_key, RefreshPublisherCallback callback) = 0; - virtual void GetPendingContributionsUI( + virtual void GetPendingContributions( GetPendingContributionsCallback callback) = 0; - virtual void RemovePendingContributionUI(const uint64_t id) = 0; - virtual void RemoveAllPendingContributionsUI() = 0; + virtual void RemovePendingContribution(const uint64_t id) = 0; + virtual void RemoveAllPendingContributions() = 0; virtual void ResetTheWholeState( const base::Callback& callback) = 0; @@ -265,9 +265,10 @@ class RewardsService : public KeyedService { static void RegisterProfilePrefs(PrefRegistrySimple* registry); - virtual void SaveRecurringTipUI(const std::string& publisher_key, - const double amount, - SaveRecurringTipCallback callback) = 0; + virtual void SaveRecurringTip( + const std::string& publisher_key, + const double amount, + SaveRecurringTipCallback callback) = 0; virtual const RewardsNotificationService::RewardsNotificationsMap& GetAllNotifications() = 0; diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 36ef1c64b331..330fb703c9c8 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -715,7 +715,7 @@ void RewardsServiceImpl::OnXHRLoad(SessionID tab_id, std::move(data)); } -void RewardsServiceImpl::OnRestorePublishersUI(const ledger::Result result) { +void RewardsServiceImpl::OnRestorePublishers(const ledger::Result result) { if (result != ledger::Result::LEDGER_OK) { return; } @@ -726,13 +726,13 @@ void RewardsServiceImpl::OnRestorePublishersUI(const ledger::Result result) { } } -void RewardsServiceImpl::RestorePublishersUI() { +void RewardsServiceImpl::RestorePublishers() { if (!Connected()) { return; } bat_ledger_->RestorePublishers( - base::BindOnce(&RewardsServiceImpl::OnRestorePublishersUI, + base::BindOnce(&RewardsServiceImpl::OnRestorePublishers, AsWeakPtr())); } @@ -2102,7 +2102,7 @@ void RewardsServiceImpl::OnPublisherBanner( std::move(callback).Run(std::move(new_banner)); } -void RewardsServiceImpl::OnSaveRecurringTipUI( +void RewardsServiceImpl::OnSaveRecurringTip( SaveRecurringTipCallback callback, const ledger::Result result) { bool success = result == ledger::Result::LEDGER_OK; @@ -2114,7 +2114,7 @@ void RewardsServiceImpl::OnSaveRecurringTipUI( std::move(callback).Run(success); } -void RewardsServiceImpl::SaveRecurringTipUI( +void RewardsServiceImpl::SaveRecurringTip( const std::string& publisher_key, const double amount, SaveRecurringTipCallback callback) { @@ -2125,7 +2125,7 @@ void RewardsServiceImpl::SaveRecurringTipUI( bat_ledger_->SaveRecurringTip( std::move(info), - base::BindOnce(&RewardsServiceImpl::OnSaveRecurringTipUI, + base::BindOnce(&RewardsServiceImpl::OnSaveRecurringTip, AsWeakPtr(), std::move(callback))); } @@ -2160,7 +2160,7 @@ void RewardsServiceImpl::SaveInlineMediaInfo( std::move(callback))); } -void RewardsServiceImpl::OnGetRecurringTipsUI( +void RewardsServiceImpl::OnGetRecurringTips( GetRecurringTipsCallback callback, ledger::PublisherInfoList list) { std::unique_ptr new_list( @@ -2175,15 +2175,15 @@ void RewardsServiceImpl::OnGetRecurringTipsUI( std::move(callback).Run(std::move(new_list)); } -void RewardsServiceImpl::GetRecurringTipsUI( +void RewardsServiceImpl::GetRecurringTips( GetRecurringTipsCallback callback) { bat_ledger_->GetRecurringTips( - base::BindOnce(&RewardsServiceImpl::OnGetRecurringTipsUI, + base::BindOnce(&RewardsServiceImpl::OnGetRecurringTips, AsWeakPtr(), std::move(callback))); } -void RewardsServiceImpl::OnGetOneTimeTipsUI( +void RewardsServiceImpl::OnGetOneTimeTips( GetRecurringTipsCallback callback, ledger::PublisherInfoList list) { std::unique_ptr new_list( @@ -2198,21 +2198,21 @@ void RewardsServiceImpl::OnGetOneTimeTipsUI( std::move(callback).Run(std::move(new_list)); } -void RewardsServiceImpl::GetOneTimeTipsUI(GetOneTimeTipsCallback callback) { +void RewardsServiceImpl::GetOneTimeTips(GetOneTimeTipsCallback callback) { bat_ledger_->GetOneTimeTips( - base::BindOnce(&RewardsServiceImpl::OnGetOneTimeTipsUI, + base::BindOnce(&RewardsServiceImpl::OnGetOneTimeTips, AsWeakPtr(), std::move(callback))); } -void RewardsServiceImpl::OnRecurringTipUI(const ledger::Result result) { +void RewardsServiceImpl::OnRecurringTip(const ledger::Result result) { bool success = result == ledger::Result::LEDGER_OK; for (auto& observer : observers_) { observer.OnRecurringTipRemoved(this, success); } } -void RewardsServiceImpl::RemoveRecurringTipUI( +void RewardsServiceImpl::RemoveRecurringTip( const std::string& publisher_key) { if (!Connected()) { return; @@ -2220,7 +2220,7 @@ void RewardsServiceImpl::RemoveRecurringTipUI( bat_ledger_->RemoveRecurringTip( publisher_key, - base::Bind(&RewardsServiceImpl::OnRecurringTipUI, + base::Bind(&RewardsServiceImpl::OnRecurringTip, AsWeakPtr())); } @@ -2537,7 +2537,7 @@ void RewardsServiceImpl::OnTip( const double amount, const bool recurring) { if (recurring) { - SaveRecurringTipUI(publisher_key, amount, base::DoNothing()); + SaveRecurringTip(publisher_key, amount, base::DoNothing()); return; } @@ -2610,7 +2610,7 @@ void RewardsServiceImpl::SetShortRetries(bool short_retries) { bat_ledger_service_->SetShortRetries(short_retries); } -void RewardsServiceImpl::GetPendingContributionsTotalUI( +void RewardsServiceImpl::GetPendingContributionsTotal( const GetPendingContributionsTotalCallback& callback) { bat_ledger_->GetPendingContributionsTotal(std::move(callback)); } @@ -2715,7 +2715,7 @@ PendingContributionInfo PendingContributionLedgerToRewards( return info; } -void RewardsServiceImpl::OnGetPendingContributionsUI( +void RewardsServiceImpl::OnGetPendingContributions( GetPendingContributionsCallback callback, ledger::PendingContributionInfoList list) { std::unique_ptr new_list( @@ -2729,38 +2729,38 @@ void RewardsServiceImpl::OnGetPendingContributionsUI( std::move(callback).Run(std::move(new_list)); } -void RewardsServiceImpl::GetPendingContributionsUI( +void RewardsServiceImpl::GetPendingContributions( GetPendingContributionsCallback callback) { bat_ledger_->GetPendingContributions( - base::BindOnce(&RewardsServiceImpl::OnGetPendingContributionsUI, + base::BindOnce(&RewardsServiceImpl::OnGetPendingContributions, AsWeakPtr(), std::move(callback))); } -void RewardsServiceImpl::OnPendingContributionRemovedUI( +void RewardsServiceImpl::OnPendingContributionRemoved( const ledger::Result result) { for (auto& observer : observers_) { observer.OnPendingContributionRemoved(this, static_cast(result)); } } -void RewardsServiceImpl::RemovePendingContributionUI(const uint64_t id) { +void RewardsServiceImpl::RemovePendingContribution(const uint64_t id) { bat_ledger_->RemovePendingContribution( id, - base::BindOnce(&RewardsServiceImpl::OnPendingContributionRemovedUI, + base::BindOnce(&RewardsServiceImpl::OnPendingContributionRemoved, AsWeakPtr())); } -void RewardsServiceImpl::OnRemoveAllPendingContributionsUI( +void RewardsServiceImpl::OnRemoveAllPendingContributions( const ledger::Result result) { for (auto& observer : observers_) { observer.OnPendingContributionRemoved(this, static_cast(result)); } } -void RewardsServiceImpl::RemoveAllPendingContributionsUI() { +void RewardsServiceImpl::RemoveAllPendingContributions() { bat_ledger_->RemoveAllPendingContributions( - base::BindOnce(&RewardsServiceImpl::OnRemoveAllPendingContributionsUI, + base::BindOnce(&RewardsServiceImpl::OnRemoveAllPendingContributions, AsWeakPtr())); } diff --git a/components/brave_rewards/browser/rewards_service_impl.h b/components/brave_rewards/browser/rewards_service_impl.h index f4058fc74ae7..756f2d3fef68 100644 --- a/components/brave_rewards/browser/rewards_service_impl.h +++ b/components/brave_rewards/browser/rewards_service_impl.h @@ -155,7 +155,7 @@ class RewardsServiceImpl : public RewardsService, const GetPublisherAllowNonVerifiedCallback& callback) override; void GetPublisherAllowVideos( const GetPublisherAllowVideosCallback& callback) override; - void RestorePublishersUI() override; + void RestorePublishers() override; void GetBalanceReport( const uint32_t month, const uint32_t year, @@ -172,11 +172,11 @@ class RewardsServiceImpl : public RewardsService, GetPublisherBannerCallback callback) override; void OnPublisherBanner(GetPublisherBannerCallback callback, ledger::PublisherBannerPtr banner); - void RemoveRecurringTipUI(const std::string& publisher_key) override; - void OnGetRecurringTipsUI( + void RemoveRecurringTip(const std::string& publisher_key) override; + void OnGetRecurringTips( GetRecurringTipsCallback callback, ledger::PublisherInfoList list); - void GetRecurringTipsUI(GetRecurringTipsCallback callback) override; + void GetRecurringTips(GetRecurringTipsCallback callback) override; void SetPublisherExclude( const std::string& publisher_key, bool exclude) override; @@ -197,21 +197,21 @@ class RewardsServiceImpl : public RewardsService, void GetAutoContributeProps( const GetAutoContributePropsCallback& callback) override; - void GetPendingContributionsTotalUI( + void GetPendingContributionsTotal( const GetPendingContributionsTotalCallback& callback) override; void GetRewardsMainEnabled( const GetRewardsMainEnabledCallback& callback) const override; - void GetOneTimeTipsUI(GetOneTimeTipsCallback callback) override; + void GetOneTimeTips(GetOneTimeTipsCallback callback) override; void RefreshPublisher( const std::string& publisher_key, RefreshPublisherCallback callback) override; void OnAdsEnabled(bool ads_enabled) override; - void OnSaveRecurringTipUI( + void OnSaveRecurringTip( SaveRecurringTipCallback callback, const ledger::Result result); - void SaveRecurringTipUI( + void SaveRecurringTip( const std::string& publisher_key, const double amount, SaveRecurringTipCallback callback) override; @@ -238,12 +238,12 @@ class RewardsServiceImpl : public RewardsService, const std::map& args, GetShareURLCallback callback) override; - void GetPendingContributionsUI( + void GetPendingContributions( GetPendingContributionsCallback callback) override; - void RemovePendingContributionUI(const uint64_t id) override; + void RemovePendingContribution(const uint64_t id) override; - void RemoveAllPendingContributionsUI() override; + void RemoveAllPendingContributions() override; void OnTip( const std::string& publisher_key, @@ -336,7 +336,7 @@ class RewardsServiceImpl : public RewardsService, const ledger::Result result, ledger::PromotionPtr promotion); void TriggerOnRewardsMainEnabled(bool rewards_main_enabled); - void OnRestorePublishersUI(const ledger::Result result); + void OnRestorePublishers(const ledger::Result result); void OnPublisherInfoListLoaded(uint32_t start, uint32_t limit, ledger::PublisherInfoListCallback callback, @@ -355,7 +355,7 @@ class RewardsServiceImpl : public RewardsService, void OnResetTheWholeState(base::Callback callback, bool success); - void OnRecurringTipUI(const ledger::Result result); + void OnRecurringTip(const ledger::Result result); void TriggerOnGetCurrentBalanceReport( ledger::BalanceReportInfoPtr report); @@ -365,23 +365,16 @@ class RewardsServiceImpl : public RewardsService, const ledger::Result result, ledger::WalletPropertiesPtr properties) override; - void OnGetOneTimeTipsUI(GetRecurringTipsCallback callback, - ledger::PublisherInfoList list); + void OnGetOneTimeTips( + GetRecurringTipsCallback callback, + ledger::PublisherInfoList list); void OnInlineTipSetting(GetInlineTipSettingCallback callback, bool enabled); void OnShareURL(GetShareURLCallback callback, const std::string& url); - void OnPendingContributionRemoved( - ledger::ResultCallback callback, - bool result); - - void OnGetPendingContributionsUI( - GetPendingContributionsCallback callback, - ledger::PendingContributionInfoList list); - void OnGetPendingContributions( - ledger::PendingContributionInfoListCallback callback, + GetPendingContributionsCallback callback, ledger::PendingContributionInfoList list); void OnURLLoaderComplete(network::SimpleURLLoader* loader, @@ -403,9 +396,9 @@ class RewardsServiceImpl : public RewardsService, void MaybeShowNotificationTipsPaid(); void ShowNotificationTipsPaid(bool ac_enabled); - void OnPendingContributionRemovedUI(const ledger::Result result); + void OnPendingContributionRemoved(const ledger::Result result); - void OnRemoveAllPendingContributionsUI(const ledger::Result result); + void OnRemoveAllPendingContributions(const ledger::Result result); void OnFetchBalance(FetchBalanceCallback callback, const ledger::Result result,