Set private/tor theme and focus color

browser/themes/theme_properties.cc

@@ -44,12 +44,13 @@ base::Optional<SkColor> MaybeGetDefaultColorForBraveLightUi(int id) {
       return kLightToolbarIcon;
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE:
       return color_utils::AlphaBlend(kLightToolbarIcon, kLightToolbar, 0.3f);
+#if BUILDFLAG(ENABLE_SIDEBAR)
+    case BraveThemeProperties::COLOR_SIDEBAR_BACKGROUND:
+      return SkColorSetRGB(0xF3, 0xF3, 0xF5);
     case BraveThemeProperties::COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED:
       return SkColorSetRGB(0xE3, 0xE3, 0xE3);
     case BraveThemeProperties::COLOR_SIDEBAR_ARROW_NORMAL:
       return SkColorSetRGB(0x21, 0x25, 0x29);
-    case BraveThemeProperties::COLOR_SIDEBAR_BACKGROUND:
-      return SkColorSetRGB(0xF3, 0xF3, 0xF5);
     case BraveThemeProperties::COLOR_SIDEBAR_ARROW_DISABLED:
       return SkColorSetARGB(0x8A, 0x49, 0x50, 0x57);
     case BraveThemeProperties::COLOR_SIDEBAR_BUTTON_BASE:
@@ -74,6 +75,7 @@ base::Optional<SkColor> MaybeGetDefaultColorForBraveLightUi(int id) {
       return SkColorSetRGB(0xF0, 0xF2, 0xFF);
     case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_BACKGROUND_HOVERED:
       return SkColorSetRGB(0x4C, 0x54, 0xD2);
+#endif
     case BraveThemeProperties::COLOR_FOR_TEST:
       return BraveThemeProperties::kLightColorForTest;
     default:
@@ -116,8 +118,9 @@ base::Optional<SkColor> MaybeGetDefaultColorForBraveDarkUi(int id) {
       return kDarkToolbarIcon;
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE:
       return color_utils::AlphaBlend(kDarkToolbarIcon, kDarkToolbar, 0.3f);
+#if BUILDFLAG(ENABLE_SIDEBAR)
     case BraveThemeProperties::COLOR_SIDEBAR_BACKGROUND:
-      return SkColorSetRGB(0x30, 0x34, 0x43);
+      return kDarkToolbar;
     case BraveThemeProperties::COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED:
       return SkColorSetRGB(0x42, 0x45, 0x51);
     case BraveThemeProperties::COLOR_SIDEBAR_ARROW_DISABLED:
@@ -146,6 +149,7 @@ base::Optional<SkColor> MaybeGetDefaultColorForBraveDarkUi(int id) {
       return SkColorSetRGB(0xF0, 0xF0, 0xFF);
     case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_BACKGROUND_HOVERED:
       return SkColorSetRGB(0x4C, 0x54, 0xD2);
+#endif
     case BraveThemeProperties::COLOR_FOR_TEST:
       return BraveThemeProperties::kDarkColorForTest;
     default:
@@ -185,6 +189,18 @@ base::Optional<SkColor> MaybeGetDefaultColorForPrivateUi(int id) {
       return kDarkToolbarIcon;
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE:
       return color_utils::AlphaBlend(kDarkToolbarIcon, kPrivateToolbar, 0.3f);
+#if BUILDFLAG(ENABLE_SIDEBAR)
+    case BraveThemeProperties::COLOR_SIDEBAR_BACKGROUND:
+      return kPrivateToolbar;
+    case BraveThemeProperties::COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED:
+      return SkColorSetRGB(0x4B, 0x3E, 0x78);
+    case BraveThemeProperties::COLOR_SIDEBAR_BORDER:
+      return SkColorSetRGB(0x3B, 0x3E, 0x4F);
+    case BraveThemeProperties::COLOR_SIDEBAR_PANEL_BORDER:
+      return SkColorSetARGB(0x21, 0x00, 0x00, 0x00);
+    case BraveThemeProperties::COLOR_SIDEBAR_ITEM_BACKGROUND:
+      return SkColorSetRGB(0x4B, 0x3E, 0x78);
+#endif
     case BraveThemeProperties::COLOR_FOR_TEST:
       return BraveThemeProperties::kPrivateColorForTest;
     // The rest is covered by a dark-appropriate value
@@ -218,6 +234,18 @@ base::Optional<SkColor> MaybeGetDefaultColorForPrivateTorUi(int id) {
       return color_utils::AlphaBlend(kDarkToolbarIcon,
                                      kPrivateTorToolbar,
                                      0.3f);
+#if BUILDFLAG(ENABLE_SIDEBAR)
+    case BraveThemeProperties::COLOR_SIDEBAR_BACKGROUND:
+      return kPrivateTorToolbar;
+    case BraveThemeProperties::COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED:
+      return SkColorSetRGB(0x5F, 0x42, 0x6F);
+    case BraveThemeProperties::COLOR_SIDEBAR_BORDER:
+      return SkColorSetRGB(0x3B, 0x3E, 0x4F);
+    case BraveThemeProperties::COLOR_SIDEBAR_PANEL_BORDER:
+      return SkColorSetARGB(0x21, 0x00, 0x00, 0x00);
+    case BraveThemeProperties::COLOR_SIDEBAR_ITEM_BACKGROUND:
+      return SkColorSetRGB(0x5F, 0x42, 0x6F);
+#endif
     // The rest is covered by a private value
     default:
       return MaybeGetDefaultColorForPrivateUi(id);

browser/themes/theme_properties.h

@@ -8,6 +8,7 @@
 
 #include "base/optional.h"
 #include "brave/browser/themes/brave_dark_mode_utils.h"
+#include "brave/components/sidebar/buildflags/buildflags.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace BraveThemeProperties {
@@ -23,6 +24,7 @@ enum TestProperty {
 enum ThemeProperties {
   BRAVE_THEME_PROPERTIES_START = 10000,
   COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT = BRAVE_THEME_PROPERTIES_START,
+#if BUILDFLAG(ENABLE_SIDEBAR)
   COLOR_SIDEBAR_ADD_BUTTON_DISABLED,
   COLOR_SIDEBAR_BACKGROUND,
   COLOR_SIDEBAR_BUTTON_BASE,
@@ -38,6 +40,7 @@ enum ThemeProperties {
   COLOR_SIDEBAR_ARROW_NORMAL,
   COLOR_SIDEBAR_ARROW_DISABLED,
   COLOR_SIDEBAR_SEPARATOR,
+#endif
   BRAVE_THEME_PROPERTIES_LAST = COLOR_SIDEBAR_SEPARATOR,
 };
 

browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc

@@ -187,7 +187,7 @@ void SidebarAddItemBubbleDelegateView::AddChildViews() {
   // |default_part| includes not added default items.
   views::View* default_part = AddChildView(std::make_unique<views::View>());
   default_part->SetLayoutManager(std::make_unique<views::BoxLayout>(
-      views::BoxLayout::Orientation::kVertical, gfx::Insets(6, 4, 8, 4), 6));
+      views::BoxLayout::Orientation::kVertical, gfx::Insets(6, 4, 8, 4), 8));
 
   for (const auto& item : not_added_default_items) {
     auto* button = default_part->AddChildView(

browser/ui/views/sidebar/sidebar_button_view.cc

@@ -4,11 +4,15 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "brave/browser/ui/views/sidebar/sidebar_button_view.h"
+#include "ui/gfx/color_palette.h"
+#include "ui/views/controls/focus_ring.h"
 
 SidebarButtonView::SidebarButtonView(Delegate* delegate) : delegate_(delegate) {
   // Locate image at center of the button.
   SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER);
   SetImageVerticalAlignment(views::ImageButton::ALIGN_MIDDLE);
+  DCHECK(GetInstallFocusRingOnFocus());
+  focus_ring()->SetColor(gfx::kBraveBlurple300);
 }
 
 SidebarButtonView::~SidebarButtonView() = default;

browser/ui/views/sidebar/sidebar_items_scroll_view.cc

@@ -18,9 +18,11 @@
 #include "ui/base/theme_provider.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
+#include "ui/gfx/color_palette.h"
 #include "ui/gfx/paint_vector_icon.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
+#include "ui/views/controls/focus_ring.h"
 
 namespace {
 
@@ -29,6 +31,8 @@ class SidebarItemsArrowView : public views::ImageButton {
   SidebarItemsArrowView() {
     SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER);
     SetImageVerticalAlignment(views::ImageButton::ALIGN_MIDDLE);
+    DCHECK(GetInstallFocusRingOnFocus());
+    focus_ring()->SetColor(gfx::kBraveBlurple300);
   }
 
   ~SidebarItemsArrowView() override = default;

chromium_src/ui/gfx/color_palette.h

@@ -14,6 +14,7 @@ constexpr SkColor kBraveGrey700 = SkColorSetRGB(0x4A, 0x4A, 0x4A);
 constexpr SkColor kBraveGrey800 = SkColorSetRGB(0x3b, 0x3e, 0x4f);
 constexpr SkColor kBraveNeutral300 = SkColorSetRGB(0xDE, 0xE2, 0xE6);
 constexpr SkColor kBraveNeutral800 = SkColorSetRGB(0x34, 0x3A, 0x40);
+constexpr SkColor kBraveBlurple300 = SkColorSetRGB(0xA0, 0xA5, 0xEB);
 
 }  // namespace gfx