Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modernising use of base::Value for brave reward dialog tip

Browse Source 
This is in preparation for the deprecations taking place upstream.
This commit is contained in:
Claudio DeSouza
2022-07-22 13:33:54 +01:00
parent 251c029bbb
commit dc7dc5f0ac
4 changed files with 57 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/brave_rewards/tip_dialog.cc
+6 -10
View File
@@ -15,7 +15,6 @@
#include "base/json/json_writer.h"
#include "base/memory/raw_ptr.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "brave/browser/brave_rewards/rewards_service_factory.h"
#include "brave/components/constants/webui_url_constants.h"
#include "chrome/browser/profiles/profile.h"
@@ -43,8 +42,7 @@ constexpr int kDialogMaxWidth = 1895;
// A ui::WebDialogDelegate that specifies the tip dialog appearance.
class TipDialogDelegate : public ui::WebDialogDelegate {
public:
explicit TipDialogDelegate(WebContents* initiator,
std::unique_ptr<base::DictionaryValue> params);
explicit TipDialogDelegate(WebContents* initiator, base::Value::Dict params);
TipDialogDelegate(const TipDialogDelegate&) = delete;
TipDialogDelegate& operator=(const TipDialogDelegate&) = delete;
~TipDialogDelegate() override;
@@ -62,13 +60,12 @@ class TipDialogDelegate : public ui::WebDialogDelegate {
private:
raw_ptr<WebContents> initiator_ = nullptr;
std::unique_ptr<base::DictionaryValue> params_;
base::Value::Dict params_;
};
TipDialogDelegate::TipDialogDelegate(WebContents* initiator,
std::unique_ptr<base::DictionaryValue> params)
: initiator_(initiator), params_(std::move(params)) {
}
base::Value::Dict params)
: initiator_(initiator), params_(std::move(params)) {}
TipDialogDelegate::~TipDialogDelegate() {
}
@@ -119,7 +116,7 @@ void TipDialogDelegate::GetDialogSize(gfx::Size* size) const {
std::string TipDialogDelegate::GetDialogArgs() const {
std::string json;
base::JSONWriter::Write(*params_, &json);
base::JSONWriter::Write(params_, &json);
return json;
}
@@ -140,8 +137,7 @@ bool TipDialogDelegate::ShouldShowDialogTitle() const {
namespace brave_rewards {
void OpenTipDialog(WebContents* initiator,
std::unique_ptr<base::DictionaryValue> params) {
void OpenTipDialog(WebContents* initiator, base::Value::Dict params) {
auto* rewards_service = RewardsServiceFactory::GetForProfile(
Profile::FromBrowserContext(initiator->GetBrowserContext()));
if (rewards_service) {
browser/brave_rewards/tip_dialog.h
+2 -6
View File
@@ -9,9 +9,7 @@
#include <memory>
#include <string>
namespace base {
class DictionaryValue;
}
#include "base/values.h"
namespace content {
class WebContents;
@@ -19,9 +17,7 @@ class WebContents;
namespace brave_rewards {
void OpenTipDialog(content::WebContents* initiator,
std::unique_ptr<base::DictionaryValue> params);
void OpenTipDialog(content::WebContents* initiator, base::Value::Dict params);
}
#endif // BRAVE_BROWSER_BRAVE_REWARDS_TIP_DIALOG_H_
browser/extensions/api/brave_rewards_api.cc
+48 -46
View File
@@ -179,18 +179,19 @@ void BraveRewardsGetPublisherInfoFunction::OnGetPublisherInfo(
return;
}
base::Value dict(base::Value::Type::DICTIONARY);
dict.SetStringKey("publisherKey", info->id);
dict.SetStringKey("name", info->name);
dict.SetIntKey("percentage", info->percent);
dict.SetIntKey("status", static_cast<int>(info->status));
dict.SetBoolKey("excluded",
info->excluded == ledger::type::PublisherExclude::EXCLUDED);
dict.SetStringKey("url", info->url);
dict.SetStringKey("provider", info->provider);
dict.SetStringKey("favIconUrl", info->favicon_url);
base::Value::Dict dict;
dict.Set("publisherKey", info->id);
dict.Set("name", info->name);
dict.Set("percentage", static_cast<int>(info->percent));
dict.Set("status", static_cast<int>(info->status));
dict.Set("excluded",
info->excluded == ledger::type::PublisherExclude::EXCLUDED);
dict.Set("url", info->url);
dict.Set("provider", info->provider);
dict.Set("favIconUrl", info->favicon_url);
Respond(TwoArguments(base::Value(static_cast<int>(result)), std::move(dict)));
Respond(TwoArguments(base::Value(static_cast<int>(result)),
base::Value(std::move(dict))));
}
BraveRewardsSetPublisherIdForTabFunction::
@@ -301,18 +302,19 @@ void BraveRewardsGetPublisherPanelInfoFunction::OnGetPublisherPanelInfo(
return;
}
base::Value dict(base::Value::Type::DICTIONARY);
dict.SetStringKey("publisherKey", info->id);
dict.SetStringKey("name", info->name);
dict.SetIntKey("percentage", info->percent);
dict.SetIntKey("status", static_cast<int>(info->status));
dict.SetBoolKey("excluded",
info->excluded == ledger::type::PublisherExclude::EXCLUDED);
dict.SetStringKey("url", info->url);
dict.SetStringKey("provider", info->provider);
dict.SetStringKey("favIconUrl", info->favicon_url);
base::Value::Dict dict;
dict.Set("publisherKey", info->id);
dict.Set("name", info->name);
dict.Set("percentage", static_cast<int>(info->percent));
dict.Set("status", static_cast<int>(info->status));
dict.Set("excluded",
info->excluded == ledger::type::PublisherExclude::EXCLUDED);
dict.Set("url", info->url);
dict.Set("provider", info->provider);
dict.Set("favIconUrl", info->favicon_url);
Respond(TwoArguments(base::Value(static_cast<int>(result)), std::move(dict)));
Respond(TwoArguments(base::Value(static_cast<int>(result)),
base::Value(std::move(dict))));
}
BraveRewardsSavePublisherInfoFunction::
@@ -373,10 +375,10 @@ ExtensionFunction::ResponseAction BraveRewardsTipSiteFunction::Run() {
base::NumberToString(params->tab_id)));
}
auto params_dict = std::make_unique<base::DictionaryValue>();
params_dict->SetString("publisherKey", params->publisher_key);
params_dict->SetString("entryPoint", params->entry_point);
params_dict->SetString(
base::Value::Dict params_dict;
params_dict.Set("publisherKey", params->publisher_key);
params_dict.Set("entryPoint", params->entry_point);
params_dict.Set(
"url", contents ? contents->GetLastCommittedURL().spec() : std::string());
::brave_rewards::OpenTipDialog(contents, std::move(params_dict));
@@ -491,20 +493,20 @@ void BraveRewardsTipUserFunction::ShowTipDialog() {
return;
}
base::Value media_meta_data_dict(base::Value::Type::DICTIONARY);
media_meta_data_dict.SetStringKey("mediaType", params->media_type);
media_meta_data_dict.SetStringKey("publisherKey", params->publisher_key);
media_meta_data_dict.SetStringKey("publisherName", params->publisher_name);
media_meta_data_dict.SetStringKey("publisherScreenName",
params->publisher_screen_name);
media_meta_data_dict.SetStringKey("postId", params->post_id);
media_meta_data_dict.SetStringKey("postTimestamp", params->post_timestamp);
media_meta_data_dict.SetStringKey("postText", params->post_text);
base::Value::Dict media_meta_data_dict;
media_meta_data_dict.Set("mediaType", params->media_type);
media_meta_data_dict.Set("publisherKey", params->publisher_key);
media_meta_data_dict.Set("publisherName", params->publisher_name);
media_meta_data_dict.Set("publisherScreenName",
params->publisher_screen_name);
media_meta_data_dict.Set("postId", params->post_id);
media_meta_data_dict.Set("postTimestamp", params->post_timestamp);
media_meta_data_dict.Set("postText", params->post_text);
auto params_dict = std::make_unique<base::DictionaryValue>();
params_dict->SetString("publisherKey", params->publisher_key);
params_dict->SetString("url", params->url);
params_dict->SetPath("mediaMetaData", std::move(media_meta_data_dict));
base::Value::Dict params_dict;
params_dict.Set("publisherKey", params->publisher_key);
params_dict.Set("url", params->url);
params_dict.Set("mediaMetaData", std::move(media_meta_data_dict));
::brave_rewards::OpenTipDialog(contents, std::move(params_dict));
}
@@ -549,8 +551,8 @@ BraveRewardsGetRewardsParametersFunction::Run() {
Profile* profile = Profile::FromBrowserContext(browser_context());
auto* rewards_service = RewardsServiceFactory::GetForProfile(profile);
if (!rewards_service) {
base::Value data(base::Value::Type::DICTIONARY);
return RespondNow(OneArgument(std::move(data)));
base::Value::Dict data;
return RespondNow(OneArgument(base::Value(std::move(data))));
}
rewards_service->GetRewardsParameters(base::BindOnce(
@@ -581,7 +583,7 @@ void BraveRewardsGetRewardsParametersFunction::OnGetRewardsParameters(
base::Value::Dict payout_status;
for (const auto& [key, value] : parameters->payout_status) {
payout_status->Set(key, value);
payout_status.Set(key, value);
}
data.Set("payoutStatus", std::move(payout_status));
@@ -595,8 +597,8 @@ ExtensionFunction::ResponseAction BraveRewardsGetBalanceReportFunction::Run() {
Profile* profile = Profile::FromBrowserContext(browser_context());
auto* rewards_service = RewardsServiceFactory::GetForProfile(profile);
if (!rewards_service) {
base::Value data(base::Value::Type::DICTIONARY);
return RespondNow(OneArgument(std::move(data)));
base::Value::Dict data;
return RespondNow(OneArgument(base::Value(std::move(data))));
}
std::unique_ptr<brave_rewards::GetBalanceReport::Params> params(
@@ -1049,8 +1051,8 @@ ExtensionFunction::ResponseAction BraveRewardsFetchBalanceFunction::Run() {
RewardsService* rewards_service =
RewardsServiceFactory::GetForProfile(profile);
if (!rewards_service) {
base::DictionaryValue balance_value;
return RespondNow(OneArgument(std::move(balance_value)));
base::Value::Dict balance_value;
return RespondNow(OneArgument(base::Value(std::move(balance_value))));
}
rewards_service->FetchBalance(
browser/ui/webui/brave_rewards_page_ui.cc
+1 -2
View File
@@ -678,8 +678,7 @@ void RewardsDOMHandler::OnGetRewardsParameters(
}
data.Set("rate", parameters->rate);
data.Set("autoContributeChoice",
parameters->auto_contribute_choice);
data.Set("autoContributeChoice", parameters->auto_contribute_choice);
data.Set("autoContributeChoices", std::move(auto_contribute_choices));
data.Set("payoutStatus", std::move(payout_status));
}