From 00f7840fae7b54be38f6ecbe450ba82555da3da1 Mon Sep 17 00:00:00 2001 From: brave-builds Date: Tue, 23 Apr 2024 05:44:52 +0000 Subject: [PATCH] Uplift of #23227 (squashed) to beta --- .../saved_tab_groups/brave_saved_tab_group_button.cc | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/browser/ui/views/bookmarks/saved_tab_groups/brave_saved_tab_group_button.cc b/browser/ui/views/bookmarks/saved_tab_groups/brave_saved_tab_group_button.cc index ee259efc80ed..e084e003380f 100644 --- a/browser/ui/views/bookmarks/saved_tab_groups/brave_saved_tab_group_button.cc +++ b/browser/ui/views/bookmarks/saved_tab_groups/brave_saved_tab_group_button.cc @@ -38,6 +38,17 @@ void BraveSavedTabGroupButton::Initialize() { } void BraveSavedTabGroupButton::UpdateButtonLayout() { + // This seems called after this class is removed from widget. + // If a tab is added to existing group and that tab is the only + // tab in the current window, it seems that window is closed + // when that group is in another window during this adding. + // I think SavedTabGroupBar should stop observing SavedTabGroupModel + // when it's removed from widget but it's upstream code and upstream + // doesn't have this issue. + if (!GetWidget()) { + return; + } + auto* cp = GetColorProvider(); // Note that upstream uses separate color IDs for the button background,