From e9cc038985e495a54b980e4fd7fb395663554719 Mon Sep 17 00:00:00 2001 From: NejcZdovc Date: Sat, 4 Jul 2020 07:01:28 +0200 Subject: [PATCH] Adds UI to clear browsing data flow https://github.com/brave/brave-browser/issues/926 --- app/brave_generated_resources.grd | 3 ++ .../clear_browsing_data_dialog.js | 31 ++++++++++++++++++- .../settings_localized_strings_provider.cc | 2 ++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd index 3934a8e1bfb3..bb2a2c5059f1 100644 --- a/app/brave_generated_resources.grd +++ b/app/brave_generated_resources.grd @@ -929,6 +929,9 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U For quick access, place your bookmarks here on the bookmarks bar. + + Reset Brave Rewards data... + diff --git a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.js b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.js index 03dbfa1c7a2d..cddce6736c22 100644 --- a/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.js +++ b/browser/resources/settings/brave_overrides/clear_browsing_data_dialog.js @@ -3,11 +3,40 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at http://mozilla.org/MPL/2.0/. +import {html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js' import {BraveClearBrowsingDataOnExitBehavior} from '../brave_clear_browsing_data_dialog/brave_clear_browsing_data_dialog_behavior.js' -import {RegisterPolymerComponentBehaviors} from 'chrome://brave-resources/polymer_overriding.js' +import {RegisterPolymerComponentBehaviors, RegisterPolymerTemplateModifications, RegisterStyleOverride} from 'chrome://brave-resources/polymer_overriding.js' +import {loadTimeData} from '../i18n_setup.js' + +RegisterStyleOverride( + 'settings-clear-browsing-data-dialog', + html` + + ` +) RegisterPolymerComponentBehaviors({ 'settings-clear-browsing-data-dialog': [ BraveClearBrowsingDataOnExitBehavior ] }) + +RegisterPolymerTemplateModifications({ + 'settings-clear-browsing-data-dialog': (templateContent) => { + const body = templateContent.querySelector('[slot="body"]') + + if (!body) { + console.error(`[Brave Settings Overrides] cannot find 'slot="body"' in clear-browsing-data-dialog`) + return + } + + body.insertAdjacentHTML( + 'beforeend', + `${loadTimeData.getString('resetRewardsData')}`) + } +}) diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc index a7ab60d6bf54..38fe22ae124d 100644 --- a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -293,6 +293,8 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source, IDS_BRAVE_P3A_ENABLE_SETTING_SUBITEM}, {"siteSettings", IDS_SETTINGS_SITE_AND_SHIELDS_SETTINGS}, + {"resetRewardsData", + IDS_SETTINGS_RESET_REWARDS_DATA}, }; AddLocalizedStringsBulk(html_source, localized_strings); html_source->AddString("webRTCLearnMoreURL",