From dfce2677a0baafa8862503fe8b31ec00e63a0c4b Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Thu, 13 Jul 2023 22:14:33 +0200
Subject: [PATCH 1/2] fix: menu border being created properly on Windows 11

---
 ..._crash_on_nativetheme_change_during_context_menu_close.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/chromium/fix_crash_on_nativetheme_change_during_context_menu_close.patch b/patches/chromium/fix_crash_on_nativetheme_change_during_context_menu_close.patch
index 5aa9096767b55..14745f2616618 100644
--- a/patches/chromium/fix_crash_on_nativetheme_change_during_context_menu_close.patch
+++ b/patches/chromium/fix_crash_on_nativetheme_change_during_context_menu_close.patch
@@ -35,7 +35,7 @@ index c4f9cea175824f9f5d592e05affdf717a391dcd6..7163f3ff0c745ce1099685028179e5ed
 -    if (menu_config.use_bubble_border && (corner_radius_ > 0) &&
 -        !menu_controller->IsCombobox()) {
 +    // Menu controller could be null during context menu being closed.
-+    bool is_combobox = menu_controller && !menu_controller->IsCombobox();
++    bool is_combobox = menu_controller && menu_controller->IsCombobox();
 +    if (menu_config.use_bubble_border && (corner_radius_ > 0) && !is_combobox) {
        CreateBubbleBorder();
      } else {

From 5a665f8c23da4b35791d7102c072702c198b8715 Mon Sep 17 00:00:00 2001
From: PatchUp <73610968+patchup[bot]@users.noreply.github.com>
Date: Thu, 13 Jul 2023 20:30:43 +0000
Subject: [PATCH 2/2] chore: update patches

---
 ..._crash_on_nativetheme_change_during_context_menu_close.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/chromium/fix_crash_on_nativetheme_change_during_context_menu_close.patch b/patches/chromium/fix_crash_on_nativetheme_change_during_context_menu_close.patch
index 14745f2616618..8b572282d23a8 100644
--- a/patches/chromium/fix_crash_on_nativetheme_change_during_context_menu_close.patch
+++ b/patches/chromium/fix_crash_on_nativetheme_change_during_context_menu_close.patch
@@ -15,7 +15,7 @@ This should be upstreamed, as other uses of MenuController in this
 file do check for menu controller being null.
 
 diff --git a/ui/views/controls/menu/menu_scroll_view_container.cc b/ui/views/controls/menu/menu_scroll_view_container.cc
-index c4f9cea175824f9f5d592e05affdf717a391dcd6..7163f3ff0c745ce1099685028179e5ed0c54ef05 100644
+index c4f9cea175824f9f5d592e05affdf717a391dcd6..74e084e4d5398371e39042c2d0ab51e7040b9451 100644
 --- a/ui/views/controls/menu/menu_scroll_view_container.cc
 +++ b/ui/views/controls/menu/menu_scroll_view_container.cc
 @@ -402,8 +402,7 @@ void MenuScrollViewContainer::CreateDefaultBorder() {