From 2fd36922c36fced8bb5b6936b985c88bfe25b1bd Mon Sep 17 00:00:00 2001
From: brave-builds <brave-builds+devops@brave.com>
Date: Sun, 13 Oct 2024 19:08:11 +0000
Subject: [PATCH] Uplift of #25913 (squashed) to beta

---
 browser/ui/color/brave_color_id.h                  | 13 +++++++------
 browser/ui/tabs/brave_tab_color_mixer.cc           |  5 +++++
 browser/ui/views/tabs/brave_tab_style_views.inc.cc |  9 ++++++---
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/browser/ui/color/brave_color_id.h b/browser/ui/color/brave_color_id.h
index c7be6b88b797..0234333ed8ad 100644
--- a/browser/ui/color/brave_color_id.h
+++ b/browser/ui/color/brave_color_id.h
@@ -117,12 +117,13 @@
 // as brave_color_mixer depends on this without deps to //ui/views:flags.
 // But it's safe have without the guard as this file is included only when
 // !is_android.
-#define BRAVE_VERTICAL_TAB_COLOR_IDS                   \
-    E_CPONLY(kColorBraveVerticalTabSeparator)          \
-    E_CPONLY(kColorBraveVerticalTabActiveBackground)   \
-    E_CPONLY(kColorBraveVerticalTabInactiveBackground) \
-    E_CPONLY(kColorBraveVerticalTabNTBIconColor)       \
-    E_CPONLY(kColorBraveVerticalTabNTBTextColor)       \
+#define BRAVE_VERTICAL_TAB_COLOR_IDS                        \
+    E_CPONLY(kColorBraveVerticalTabSeparator)               \
+    E_CPONLY(kColorBraveVerticalTabActiveBackground)        \
+    E_CPONLY(kColorBraveVerticalTabInactiveBackground)      \
+    E_CPONLY(kColorBraveVerticalTabInactiveHoverBackground) \
+    E_CPONLY(kColorBraveVerticalTabNTBIconColor)            \
+    E_CPONLY(kColorBraveVerticalTabNTBTextColor)            \
     E_CPONLY(kColorBraveVerticalTabNTBShortcutTextColor)
 
 #define BRAVE_SHARED_PINNED_TAB_COLOR_IDS                    \
diff --git a/browser/ui/tabs/brave_tab_color_mixer.cc b/browser/ui/tabs/brave_tab_color_mixer.cc
index 494d7c2ff32f..23da39543782 100644
--- a/browser/ui/tabs/brave_tab_color_mixer.cc
+++ b/browser/ui/tabs/brave_tab_color_mixer.cc
@@ -13,6 +13,7 @@
 #include "ui/color/color_provider.h"
 #include "ui/color/color_provider_key.h"
 #include "ui/color/color_recipe.h"
+#include "ui/color/color_transform.h"
 
 namespace tabs {
 
@@ -30,6 +31,10 @@ void AddBraveTabThemeColorMixer(ui::ColorProvider* provider,
   mixer[kColorBraveVerticalTabActiveBackground] = {
       kColorTabBackgroundInactiveFrameActive};
   mixer[kColorBraveVerticalTabInactiveBackground] = {kColorToolbar};
+  mixer[kColorBraveVerticalTabInactiveHoverBackground] =
+      ui::AlphaBlend(kColorBraveVerticalTabActiveBackground,
+                     kColorBraveVerticalTabInactiveBackground,
+                     /* 40% opacity */ 0.4 * SK_AlphaOPAQUE);
   mixer[kColorBraveVerticalTabSeparator] = {kColorToolbarContentAreaSeparator};
   mixer[kColorBraveVerticalTabNTBIconColor] = {
       kColorTabForegroundInactiveFrameActive};
diff --git a/browser/ui/views/tabs/brave_tab_style_views.inc.cc b/browser/ui/views/tabs/brave_tab_style_views.inc.cc
index aa7d4cd42503..18103af8fe5f 100644
--- a/browser/ui/views/tabs/brave_tab_style_views.inc.cc
+++ b/browser/ui/views/tabs/brave_tab_style_views.inc.cc
@@ -413,9 +413,12 @@ SkColor BraveVerticalTabStyle::GetTargetTabBackgroundColor(
     return gfx::kPlaceholderColor;
   }
 
-  return cp->GetColor(selection_state == TabStyle::TabSelectionState::kActive
-                          ? kColorBraveVerticalTabActiveBackground
-                          : kColorBraveVerticalTabInactiveBackground);
+  if (selection_state == TabStyle::TabSelectionState::kInactive) {
+    return cp->GetColor(hovered ? kColorBraveVerticalTabInactiveHoverBackground
+                                : kColorBraveVerticalTabInactiveBackground);
+  }
+
+  return cp->GetColor(kColorBraveVerticalTabActiveBackground);
 }
 
 bool BraveVerticalTabStyle::ShouldShowVerticalTabs() const {