Uplift of #10398 (squashed) to beta

brave · Oct 7, 2021 · 25a0880 · 25a0880
1 parent 89a57a1
commit 25a0880
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/browser/themes/brave_theme_helper_win.cc b/browser/themes/brave_theme_helper_win.cc
@@ -13,12 +13,9 @@ SkColor BraveThemeHelperWin::GetDefaultColor(
     const CustomThemeSupplier* theme_supplier) const {
   // Prevent dcheck in chrome/browser/themes/theme_properties.cc(384)
   // It assumes these ids are handled in theme service.
-  if (DwmColorsAllowed(theme_supplier)) {
-    if (id == ThemeProperties::COLOR_ACCENT_BORDER_ACTIVE)
-      return dwm_accent_border_color_;
-    // In Windows 10, native inactive borders are #555555 with 50% alpha.
-    if (id == ThemeProperties::COLOR_ACCENT_BORDER_INACTIVE)
-      return SkColorSetARGB(0x80, 0x55, 0x55, 0x55);
+  if (id == ThemeProperties::COLOR_ACCENT_BORDER_ACTIVE ||
+      id == ThemeProperties::COLOR_ACCENT_BORDER_INACTIVE) {
+    return ThemeHelperWin::GetDefaultColor(id, incognito, theme_supplier);
   }
   // Skip ThemeHelperWin::GetDefaultColor() to prevent using dwm frame color.
   return BraveThemeHelper::GetDefaultColor(id, incognito, theme_supplier);