Merge pull request #12624 from brave/uplift_sidebar_fixes_1_37

Uplift several sidebar fixes (uplift to 1.37.x)

app/brave_generated_resources.grd

@@ -1417,6 +1417,9 @@ Are you sure you want to do this?
         <message name="IDS_SIDEBAR_SHOW_OPTION_TITLE" desc="Title of sidebar show option menu">
           Show Sidebar
         </message>
+        <message name="IDS_SETTINGS_SIDEBAR_SHOW_OPTION_TITLE" desc="Title of sidebar show option menu in settings">
+          Show Sidebar
+        </message>
         <message name="IDS_SIDEBAR_SHOW_OPTION_ALWAYS" desc="Label for always show sidebar option">
           Always
         </message>

app/theme/brave_theme_resources.grd

@@ -34,7 +34,7 @@
 
       <if expr="enable_sidebar">
         <structure type="chrome_scaled_image" name="IDR_SIDEBAR_BOOKMARKS_FOCUSED" file="brave/sidebar_bookmark_focused.png" />
-        <structure type="chrome_scaled_image" name="IDR_SIDEBAR_BRAVE_TOGETHER_FOCUSED" file="brave/sidebar_brave_together_focused.png" />
+        <structure type="chrome_scaled_image" name="IDR_SIDEBAR_BRAVE_TALK_FOCUSED" file="brave/sidebar_brave_talk_focused.png" />
         <structure type="chrome_scaled_image" name="IDR_SIDEBAR_CRYPTO_WALLET_FOCUSED" file="brave/sidebar_crypto_wallet_focused.png" />
         <structure type="chrome_scaled_image" name="IDR_SIDEBAR_HISTORY_FOCUSED" file="brave/sidebar_history_focused.png" />
         <structure type="chrome_scaled_image" name="IDR_SIDEBAR_ITEM_HIGHLIGHT" file="brave/sidebar_item_highlight.png" />

app/vector_icons/BUILD.gn

@@ -26,7 +26,7 @@ aggregate_vector_icons("brave_vector_icons") {
     sources += [
       "sidebar_add_item.icon",
       "sidebar_bookmarks.icon",
-      "sidebar_brave_together.icon",
+      "sidebar_brave_talk.icon",
       "sidebar_crypto_wallet.icon",
       "sidebar_history.icon",
       "sidebar_item_added_check.icon",

app/vector_icons/sidebar_bookmarks.icon

@@ -1,47 +1,49 @@
-CANVAS_DIMENSIONS, 16,
-MOVE_TO, 13.59f, 1.23f,
-H_LINE_TO, 2.72f,
-R_CUBIC_TO, -0.46f, 0, -0.82f, 0.33f, -0.82f, 0.71f,
-R_V_LINE_TO, 11.6f,
-R_ARC_TO, 0.62f, 0.62f, 0, 1, 1, -1.23f, 0,
-V_LINE_TO, 1.94f,
-CUBIC_TO, 0.67f, 0.86f, 1.6f, 0, 2.72f, 0,
-R_H_LINE_TO, 10.98f,
-R_CUBIC_TO, 0.62f, 0, 1.12f, 0.49f, 1.12f, 1.11f,
-R_V_LINE_TO, 10.77f,
-R_ARC_TO, 0.62f, 0.62f, 0, 1, 1, -1.23f, 0,
-V_LINE_TO, 1.23f,
+CANVAS_DIMENSIONS, 24,
+MOVE_TO, 20.38f, 1.85f,
+H_LINE_TO, 4.08f,
+R_CUBIC_TO, -0.7f, 0, -1.23f, 0.49f, -1.23f, 1.06f,
+R_V_LINE_TO, 17.4f,
+R_ARC_TO, 0.92f, 0.92f, 0, 1, 1, -1.85f, 0,
+V_LINE_TO, 2.91f,
+CUBIC_TO, 1, 1.28f, 2.39f, 0, 4.08f, 0,
+R_H_LINE_TO, 16.47f,
+R_CUBIC_TO, 0.93f, 0, 1.68f, 0.74f, 1.68f, 1.66f,
+R_V_LINE_TO, 16.16f,
+R_ARC_TO, 0.92f, 0.92f, 0, 0, 1, -1.85f, 0,
+V_LINE_TO, 1.85f,
 CLOSE,
-MOVE_TO, 14.82f, 14.77f,
-R_ARC_TO, 0.62f, 0.62f, 0, 1, 1, 0, 1.23f,
-H_LINE_TO, 3.16f,
-CUBIC_TO, 1.79f, 16, 0.67f, 14.9f, 0.67f, 13.54f,
-R_CUBIC_TO, 0, -1.36f, 1.12f, -2.46f, 2.5f, -2.46f,
-H_LINE_TO, 14.82f,
-R_ARC_TO, 0.62f, 0.62f, 0, 1, 1, 0, 1.23f,
-H_LINE_TO, 3.16f,
-R_CUBIC_TO, -0.7f, 0, -1.26f, 0.55f, -1.26f, 1.23f,
-R_CUBIC_TO, 0, 0.68f, 0.56f, 1.23f, 1.26f, 1.23f,
-H_LINE_TO, 14.82f,
+NEW_PATH,
+MOVE_TO, 22.23f, 22.15f,
+R_ARC_TO, 0.92f, 0.92f, 0, 0, 1, 0, 1.85f,
+H_LINE_TO, 4.75f,
+CUBIC_TO, 2.68f, 24, 1, 22.35f, 1, 20.31f,
+R_CUBIC_TO, 0, -2.04f, 1.68f, -3.69f, 3.74f, -3.69f,
+H_LINE_TO, 22.23f,
+R_ARC_TO, 0.92f, 0.92f, 0, 0, 1, 0, 1.85f,
+H_LINE_TO, 4.74f,
+R_CUBIC_TO, -1.05f, 0, -1.9f, 0.83f, -1.9f, 1.85f,
+R_CUBIC_TO, 0, 1.02f, 0.85f, 1.85f, 1.9f, 1.85f,
+H_LINE_TO, 22.23f,
 CLOSE,
-MOVE_TO, 14.44f, 15.22f,
-R_ARC_TO, 0.62f, 0.62f, 0, 1, 1, -1.18f, 0.33f,
-R_ARC_TO, 7.39f, 7.39f, 0, 0, 1, 0, -4.03f,
-R_ARC_TO, 0.62f, 0.62f, 0, 0, 1, 1.19f, 0.33f,
-R_ARC_TO, 6.16f, 6.16f, 0, 0, 0, 0, 3.36f,
+NEW_PATH,
+MOVE_TO, 21.66f, 22.83f,
+R_ARC_TO, 0.92f, 0.92f, 0, 1, 1, -1.78f, 0.5f,
+R_ARC_TO, 11.08f, 11.08f, 0, 0, 1, 0, -6.04f,
+R_ARC_TO, 0.92f, 0.92f, 0, 0, 1, 1.78f, 0.5f,
+R_ARC_TO, 9.24f, 9.24f, 0, 0, 0, 0, 5.04f,
 CLOSE,
-MOVE_TO, 9.9f, 0.62f,
-R_ARC_TO, 0.62f, 0.62f, 0, 0, 1, 1.23f, 0,
-V_LINE_TO, 6.77f,
-R_CUBIC_TO, 0, 0.52f, -0.6f, 0.81f, -1, 0.48f,
-R_LINE_TO, -2.07f, -1.7f,
-R_LINE_TO, -2.07f, 1.7f,
-R_ARC_TO, 0.62f, 0.62f, 0, 0, 1, -1, -0.48f,
-V_LINE_TO, 0.62f,
-R_ARC_TO, 0.62f, 0.62f, 0, 1, 1, 1.23f, 0,
-R_V_LINE_TO, 4.85f,
-LINE_TO, 7.66f, 4.27f,
-R_ARC_TO, 0.62f, 0.62f, 0, 0, 1, 0.78f, 0,
-R_LINE_TO, 1.46f, 1.19f,
-V_LINE_TO, 0.62f,
+MOVE_TO, 14.85f, 0.92f,
+R_ARC_TO, 0.92f, 0.92f, 0, 0, 1, 1.85f, 0,
+R_V_LINE_TO, 9.23f,
+R_ARC_TO, 0.92f, 0.92f, 0, 0, 1, -1.51f, 0.71f,
+LINE_TO, 12.08f, 8.32f,
+LINE_TO, 8.97f, 10.87f,
+R_ARC_TO, 0.92f, 0.92f, 0, 0, 1, -1.51f, -0.71f,
+V_LINE_TO, 0.92f,
+R_ARC_TO, 0.92f, 0.92f, 0, 0, 1, 1.85f, 0,
+R_V_LINE_TO, 7.28f,
+LINE_TO, 11.49f, 6.41f,
+R_CUBIC_TO, 0.34f, -0.28f, 0.83f, -0.28f, 1.17f, 0,
+R_LINE_TO, 2.18f, 1.79f,
+V_LINE_TO, 0.92f,
 CLOSE

app/vector_icons/sidebar_crypto_wallet.icon

@@ -1,47 +1,46 @@
-CANVAS_DIMENSIONS, 16,
-MOVE_TO, 6.67f, 0.67f,
-R_CUBIC_TO, 0.94f, 0, 1.82f, 0.39f, 2.43f, 1.06f,
-ARC_TO, 3.33f, 3.33f, 0, 0, 1, 14, 4.67f,
-R_ARC_TO, 2, 2, 0, 0, 1, 2, 2,
-R_V_LINE_TO, 6.67f,
-R_ARC_TO, 2, 2, 0, 0, 1, -2, 2,
-H_LINE_TO, 2,
-R_ARC_TO, 2, 2, 0, 0, 1, -2, -2,
-V_LINE_TO, 4.67f,
-R_CUBIC_TO, 0, -0.04f, 0, -0.08f, 0.01f, -0.12f,
-ARC_TO, 2.1f, 2.1f, 0, 0, 1, 0, 4.33f,
-R_CUBIC_TO, 0, -0.92f, 0.75f, -1.67f, 1.67f, -1.67f,
-H_LINE_TO, 3.61f,
-R_CUBIC_TO, 0.51f, -1.18f, 1.69f, -2, 3.06f, -2,
+CANVAS_DIMENSIONS, 25,
+MOVE_TO, 0, 3.61f,
+ARC_TO, 2.61f, 2.61f, 0, 0, 1, 2.61f, 1,
+R_H_LINE_TO, 16.22f,
+R_ARC_TO, 3, 3, 0, 0, 1, 3, 3,
+R_V_LINE_TO, 0.23f,
+H_LINE_TO, 22,
+R_ARC_TO, 3, 3, 0, 0, 1, 3, 3,
+V_LINE_TO, 20,
+R_ARC_TO, 3, 3, 0, 0, 1, -3, 3,
+H_LINE_TO, 3,
+R_ARC_TO, 3, 3, 0, 0, 1, -3, -3,
+V_LINE_TO, 3.61f,
 CLOSE,
-MOVE_TO, 3.33f, 4,
-H_LINE_TO, 1.67f,
-R_ARC_TO, 0.33f, 0.33f, 0, 0, 0, -0.33f, 0.33f,
-R_CUBIC_TO, 0, 0.25f, 0.11f, 0.33f, 0.67f, 0.33f,
-R_H_LINE_TO, 1.4f,
-ARC_TO, 3.35f, 3.35f, 0, 0, 1, 3.33f, 4,
+R_MOVE_TO, 2, 2.54f,
+V_LINE_TO, 20,
+R_ARC_TO, 1, 1, 0, 0, 0, 1, 1,
+R_H_LINE_TO, 19,
+R_ARC_TO, 1, 1, 0, 0, 0, 1, -1,
+R_V_LINE_TO, -1.89f,
+R_H_LINE_TO, -7.31f,
+R_ARC_TO, 3, 3, 0, 0, 1, -3, -3,
+V_LINE_TO, 12.27f,
+R_ARC_TO, 3, 3, 0, 0, 1, 3, -3,
+H_LINE_TO, 23,
+V_LINE_TO, 7.23f,
+R_ARC_TO, 1, 1, 0, 0, 0, -1, -1,
+H_LINE_TO, 2.61f,
+ARC_TO, 2.62f, 2.62f, 0, 0, 1, 2, 6.15f,
 CLOSE,
-R_MOVE_TO, 0, 2,
-H_LINE_TO, 2,
-R_CUBIC_TO, -0.24f, 0, -0.46f, -0.02f, -0.67f, -0.07f,
-R_V_LINE_TO, 7.4f,
-R_CUBIC_TO, 0, 0.37f, 0.3f, 0.67f, 0.67f, 0.67f,
-R_H_LINE_TO, 12,
-R_ARC_TO, 0.67f, 0.67f, 0, 0, 0, 0.67f, -0.67f,
-V_LINE_TO, 6.67f,
-ARC_TO, 0.67f, 0.67f, 0, 0, 0, 14, 6,
-H_LINE_TO, 3.33f,
+R_MOVE_TO, 21, 5.12f,
+R_H_LINE_TO, -7.31f,
+R_ARC_TO, 1, 1, 0, 0, 0, -1, 1,
+R_V_LINE_TO, 2.84f,
+R_ARC_TO, 1, 1, 0, 0, 0, 1, 1,
+H_LINE_TO, 23,
+V_LINE_TO, 11.27f,
 CLOSE,
-MOVE_TO, 4.78f, 4.67f,
-R_H_LINE_TO, 2.55f,
-R_CUBIC_TO, 0, -0.79f, 0.28f, -1.52f, 0.74f, -2.09f,
-R_ARC_TO, 2, 2, 0, 0, 0, -3.29f, 2.09f,
-CLOSE,
-R_MOVE_TO, 3.89f, 0,
-R_H_LINE_TO, 4,
-R_ARC_TO, 2, 2, 0, 0, 0, -4, 0,
-CLOSE,
-MOVE_TO, 12, 11.33f,
-R_ARC_TO, 1.33f, 1.33f, 0, 1, 0, 0, -2.67f,
-R_ARC_TO, 1.33f, 1.33f, 0, 0, 0, 0, 2.67f,
+MOVE_TO, 2, 3.61f,
+R_CUBIC_TO, 0, 0.34f, 0.27f, 0.61f, 0.61f, 0.61f,
+R_H_LINE_TO, 17.22f,
+V_LINE_TO, 4,
+R_ARC_TO, 1, 1, 0, 0, 0, -1, -1,
+H_LINE_TO, 2.61f,
+ARC_TO, 0.61f, 0.61f, 0, 0, 0, 2, 3.61f,
 CLOSE

browser/brave_profile_prefs.cc

@@ -403,7 +403,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
 #endif
 
 #if BUILDFLAG(ENABLE_SIDEBAR)
-  sidebar::SidebarService::RegisterProfilePrefs(registry);
+  sidebar::SidebarService::RegisterProfilePrefs(registry, chrome::GetChannel());
 #endif
 
 #if !defined(OS_ANDROID)

browser/themes/brave_theme_helper.cc

@@ -8,9 +8,11 @@
 #include "base/numerics/safe_conversions.h"
 #include "brave/browser/themes/brave_dark_mode_utils.h"
 #include "brave/browser/themes/theme_properties.h"
+#include "brave/components/sidebar/buildflags/buildflags.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/omnibox/omnibox_theme.h"
 #include "ui/gfx/color_palette.h"
+#include "ui/gfx/color_utils.h"
 #include "ui/native_theme/native_theme.h"
 
 #if defined(OS_LINUX)
@@ -104,6 +106,43 @@ SkColor BraveThemeHelper::GetDefaultColor(
   if (!incognito && (is_tor_ || is_guest_)) {
     incognito = true;
   }
+
+#if BUILDFLAG(ENABLE_SIDEBAR)
+  switch (id) {
+    // Pick most contrast color between our light and dark colors based on
+    // current toolbar color.
+    case BraveThemeProperties::COLOR_SIDEBAR_ITEM_DRAG_INDICATOR_COLOR:
+    case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUTTON_DISABLED:
+    case BraveThemeProperties::COLOR_SIDEBAR_BUTTON_BASE:
+    case BraveThemeProperties::COLOR_SIDEBAR_ARROW_NORMAL:
+    case BraveThemeProperties::COLOR_SIDEBAR_ARROW_DISABLED: {
+      const auto toolbar_color =
+          GetColor(ThemeProperties::COLOR_TOOLBAR, incognito, theme_supplier);
+      const auto base_button_color_light = MaybeGetDefaultColorForBraveUi(
+          id, incognito, is_tor_,
+          dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_LIGHT);
+      const auto base_button_color_dark = MaybeGetDefaultColorForBraveUi(
+          id, incognito, is_tor_,
+          dark_mode::BraveDarkModeType::BRAVE_DARK_MODE_TYPE_DARK);
+      DCHECK(base_button_color_light && base_button_color_dark);
+      return color_utils::PickContrastingColor(base_button_color_light.value(),
+                                               base_button_color_dark.value(),
+                                               toolbar_color);
+    }
+    case BraveThemeProperties::COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED:
+    case BraveThemeProperties::COLOR_SIDEBAR_ITEM_BACKGROUND_HOVERED: {
+      // Copied from chrome/browser/ui/views/toolbar/toolbar_ink_drop_util.h
+      // to use same hover background with toolbar button.
+      constexpr float kToolbarInkDropHighlightVisibleOpacity = 0.08f;
+      return SkColorSetA(GetColor(ThemeProperties::COLOR_TOOLBAR_INK_DROP,
+                                  incognito, theme_supplier),
+                         0xFF * kToolbarInkDropHighlightVisibleOpacity);
+    }
+    default:
+      break;
+  }
+#endif
+
   const dark_mode::BraveDarkModeType type =
       dark_mode::GetActiveBraveDarkModeType();
   const absl::optional<SkColor> braveColor =

browser/themes/theme_properties.cc

@@ -59,10 +59,6 @@ absl::optional<SkColor> MaybeGetDefaultColorForBraveLightUi(int id) {
     case BraveThemeProperties::COLOR_MENU_ITEM_SUB_TEXT_COLOR:
       return SkColorSetRGB(0x86, 0x8E, 0x96);
 #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_ARROW_DISABLED:
@@ -71,12 +67,6 @@ absl::optional<SkColor> MaybeGetDefaultColorForBraveLightUi(int id) {
       return SkColorSetRGB(0x49, 0x50, 0x57);
     case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUTTON_DISABLED:
       return SkColorSetARGB(0X66, 0x49, 0x50, 0x57);
-    case BraveThemeProperties::COLOR_SIDEBAR_BORDER:
-      return SkColorSetRGB(0xD5, 0xD5, 0xDC);
-    case BraveThemeProperties::COLOR_SIDEBAR_PANEL_BORDER:
-      return SkColorSetARGB(0x21, 0x00, 0x00, 0x00);
-    case BraveThemeProperties::COLOR_SIDEBAR_ITEM_BACKGROUND:
-      return SkColorSetRGB(0xE8, 0xE8, 0xE8);
     case BraveThemeProperties::COLOR_SIDEBAR_ITEM_DRAG_INDICATOR_COLOR:
       return SkColorSetRGB(0x21, 0x25, 0x29);
     case BraveThemeProperties::COLOR_SIDEBAR_SEPARATOR:
@@ -165,10 +155,6 @@ absl::optional<SkColor> MaybeGetDefaultColorForBraveDarkUi(int id) {
     case BraveThemeProperties::COLOR_MENU_ITEM_SUB_TEXT_COLOR:
       return SkColorSetRGB(0x84, 0x88, 0x9C);
 #if BUILDFLAG(ENABLE_SIDEBAR)
-    case BraveThemeProperties::COLOR_SIDEBAR_BACKGROUND:
-      return kDarkToolbar;
-    case BraveThemeProperties::COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED:
-      return SkColorSetRGB(0x42, 0x45, 0x51);
     case BraveThemeProperties::COLOR_SIDEBAR_ARROW_DISABLED:
       return SkColorSetARGB(0x8A, 0xAE, 0xB1, 0xC2);
     case BraveThemeProperties::COLOR_SIDEBAR_ARROW_NORMAL:
@@ -177,12 +163,6 @@ absl::optional<SkColor> MaybeGetDefaultColorForBraveDarkUi(int id) {
       return SkColorSetRGB(0xC2, 0xC4, 0xCF);
     case BraveThemeProperties::COLOR_SIDEBAR_ADD_BUTTON_DISABLED:
       return SkColorSetARGB(0x66, 0xC2, 0xC4, 0xCF);
-    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(0x41, 0x44, 0x51);
     case BraveThemeProperties::COLOR_SIDEBAR_ITEM_DRAG_INDICATOR_COLOR:
       return SkColorSetRGB(0xC2, 0xC4, 0xCF);
     case BraveThemeProperties::COLOR_SIDEBAR_SEPARATOR:
@@ -253,18 +233,6 @@ absl::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
@@ -295,21 +263,8 @@ absl::optional<SkColor> MaybeGetDefaultColorForPrivateTorUi(int id) {
     case ThemeProperties::COLOR_TAB_BACKGROUND_ACTIVE_FRAME_INACTIVE:
       return kPrivateTorToolbar;
     case ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON_INACTIVE:
-      return color_utils::AlphaBlend(kDarkToolbarIcon,
-                                     kPrivateTorToolbar,
+      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

@@ -33,21 +33,18 @@ enum ThemeProperties {
   COLOR_TOGGLE_BUTTON_TRACK_OFF_COLOR,
   COLOR_MENU_ITEM_SUB_TEXT_COLOR,
 #if BUILDFLAG(ENABLE_SIDEBAR)
-  COLOR_SIDEBAR_ADD_BUTTON_DISABLED,
-  COLOR_SIDEBAR_BACKGROUND,
-  COLOR_SIDEBAR_BUTTON_BASE,
-  COLOR_SIDEBAR_BORDER,
-  COLOR_SIDEBAR_PANEL_BORDER,
-  COLOR_SIDEBAR_ITEM_BACKGROUND,
-  COLOR_SIDEBAR_ITEM_DRAG_INDICATOR_COLOR,
   COLOR_SIDEBAR_ADD_BUBBLE_BACKGROUND,
+  COLOR_SIDEBAR_ADD_BUTTON_DISABLED,
   COLOR_SIDEBAR_ADD_BUBBLE_HEADER_TEXT,
   COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_NORMAL,
   COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_HOVERED,
   COLOR_SIDEBAR_ADD_BUBBLE_ITEM_TEXT_BACKGROUND_HOVERED,
   COLOR_SIDEBAR_ARROW_BACKGROUND_HOVERED,
   COLOR_SIDEBAR_ARROW_NORMAL,
   COLOR_SIDEBAR_ARROW_DISABLED,
+  COLOR_SIDEBAR_BUTTON_BASE,
+  COLOR_SIDEBAR_ITEM_BACKGROUND_HOVERED,
+  COLOR_SIDEBAR_ITEM_DRAG_INDICATOR_COLOR,
   COLOR_SIDEBAR_SEPARATOR,
 #endif
 #if BUILDFLAG(ENABLE_SPEEDREADER)