From 079f5c1d1dcd6479c0e265f8fdf89c45b5dc9757 Mon Sep 17 00:00:00 2001 From: ryanml Date: Tue, 18 Jun 2019 13:14:29 -0700 Subject: [PATCH 1/2] Fixes brave/brave-browser#4581 - Adds wallet entry to settings bar when is_official_build=false --- ui/webui/resources/BUILD.gn | 6 +++++- .../br_elements/br_toolbar/br_toolbar.html | 13 +++++++++++++ ui/webui/resources/br_elements_resources.grdp | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ui/webui/resources/BUILD.gn b/ui/webui/resources/BUILD.gn index 775bcf97699..62ed58d7e59 100644 --- a/ui/webui/resources/BUILD.gn +++ b/ui/webui/resources/BUILD.gn @@ -1,8 +1,12 @@ import("//tools/grit/grit_rule.gni") import("//ui/webui/webui_features.gni") +import("//build/config/features.gni") grit("resources") { - defines = [ "optimize_webui=$optimize_webui" ] + defines = [ + "optimize_webui=$optimize_webui", + "is_official_build=$is_official_build" + ] source = "brave_webui_resources.grd" # The .grd contains references to generated files. diff --git a/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html b/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html index 3d427e13b73..88918f709f5 100644 --- a/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html +++ b/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html @@ -129,6 +129,19 @@ Brave Rewards + +
  • + + + + + + + Wallets + +
    • +
  • diff --git a/ui/webui/resources/br_elements_resources.grdp b/ui/webui/resources/br_elements_resources.grdp index a71c4337e41..d9c9a58184e 100644 --- a/ui/webui/resources/br_elements_resources.grdp +++ b/ui/webui/resources/br_elements_resources.grdp @@ -7,6 +7,7 @@ Date: Fri, 21 Jun 2019 00:17:13 -0700 Subject: [PATCH 2/2] Fixes brave/brave-browser#5006 - Uses translated string for Brave Rewards nav item --- app/brave_generated_resources.grd | 2 +- .../ui/webui/navigation_bar_data_provider.cc | 6 ++++ .../resources/brave_components_strings.grd | 2 ++ .../br_elements/br_toolbar/br_toolbar.html | 30 +++++++++---------- .../br_elements/br_toolbar/br_toolbar.js | 2 ++ 5 files changed, 26 insertions(+), 16 deletions(-) diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd index b79523b490a..c010862635a 100644 --- a/app/brave_generated_resources.grd +++ b/app/brave_generated_resources.grd @@ -130,7 +130,7 @@ Sync - Brave Wallet + Crypto Wallets $1 (extension ID "$2abacabadabacabaeabacabadabacabaf") is not allowed in Brave. diff --git a/browser/ui/webui/navigation_bar_data_provider.cc b/browser/ui/webui/navigation_bar_data_provider.cc index f08ed5563fc..9e7aa37da97 100644 --- a/browser/ui/webui/navigation_bar_data_provider.cc +++ b/browser/ui/webui/navigation_bar_data_provider.cc @@ -9,6 +9,8 @@ #include "components/strings/grit/components_strings.h" #include "content/public/browser/web_ui_data_source.h" +#include "components/grit/brave_components_strings.h" + // static void NavigationBarDataProvider::Initialize(content::WebUIDataSource* source) { source->AddLocalizedString( @@ -19,5 +21,9 @@ void NavigationBarDataProvider::Initialize(content::WebUIDataSource* source) { "brToolbarDownloadsTitle", IDS_DOWNLOAD_TITLE); source->AddLocalizedString( "brToolbarHistoryTitle", IDS_HISTORY_TITLE); + source->AddLocalizedString( + "brToolbarRewardsTitle", IDS_BRAVE_UI_BRAVE_REWARDS); + source->AddLocalizedString( + "brToolbarWalletsTitle", IDS_WALLETS_TITLE); } diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd index e45dfd038fb..27c292a1fba 100644 --- a/components/resources/brave_components_strings.grd +++ b/components/resources/brave_components_strings.grd @@ -613,6 +613,8 @@ You might be having network trouble, or there could be a problem with the Sync servers. Couldn't connect to Sync servers Your computer's clock may be set to the wrong time or time zone. Check your clock settings. + + Crypto Wallets diff --git a/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html b/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html index 88918f709f5..60857ac32d3 100644 --- a/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html +++ b/ui/webui/resources/br_elements/br_toolbar/br_toolbar.html @@ -118,7 +118,7 @@ [[settingsTitle]]
    • -
  • +
  • - Brave Rewards + [[braveRewardsTitle]]
    • - -
  • - - - - - - - Wallets - -
    • -
  • @@ -176,6 +163,19 @@ [[downloadsTitle]]
    • + +
  • + + + + + + + [[walletsTitle]] + +
    • +