From 4e1567324ef3120b61481b472ada1e3e37a4796a Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 4 May 2026 02:11:00 +0100 Subject: [PATCH] [cr149] `toolbar_height_side_panel()` now just `side_panel()` This is an accessor renaming for `BrowserView` and `BrowserViewLayoutViews`. Chromium changes: https://chromium.googlesource.com/chromium/src/+/49935f86367082b50b34fc7be3ead05a6a642e0c commit 49935f86367082b50b34fc7be3ead05a6a642e0c Author: Caroline Rising Date: Fri May 1 09:28:08 2026 -0700 [Side panel] Rename uses of toolbar height side panel to be side panel Bug: 505776475 Change-Id: I57b648e79dff947ec18eeb4a3621affb10b3b089 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7807791 Reviewed-by: Eshwar Stalin Commit-Queue: Caroline Rising Cr-Commit-Position: refs/heads/main@{#1623866} --- browser/ai_chat/ai_chat_sidepanel_behavior_browsertest.cc | 2 +- browser/ai_chat/ai_chat_ui_browsertest.cc | 4 ++-- browser/ui/brave_browser_command_controller_browsertest.cc | 4 ++-- browser/ui/sidebar/sidebar_browsertest.cc | 6 +++--- browser/ui/views/frame/brave_browser_view_browsertest.cc | 6 +++--- .../frame/layout/brave_browser_view_tabbed_layout_impl.cc | 2 +- browser/ui/views/side_panel/brave_side_panel_coordinator.cc | 3 +-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/browser/ai_chat/ai_chat_sidepanel_behavior_browsertest.cc b/browser/ai_chat/ai_chat_sidepanel_behavior_browsertest.cc index 1187317eb0b..45e414ea1e0 100644 --- a/browser/ai_chat/ai_chat_sidepanel_behavior_browsertest.cc +++ b/browser/ai_chat/ai_chat_sidepanel_behavior_browsertest.cc @@ -166,7 +166,7 @@ IN_PROC_BROWSER_TEST_P(AIChatGlobalSidePanelBrowserTest, // actually attached to the browser window. auto* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); ASSERT_TRUE(browser_view); - auto* side_panel = browser_view->toolbar_height_side_panel(); + auto* side_panel = browser_view->side_panel(); ASSERT_TRUE(side_panel); auto* view = side_panel->GetContentParentView()->GetViewByID( SidePanelWebUIView::kSidePanelWebViewId); diff --git a/browser/ai_chat/ai_chat_ui_browsertest.cc b/browser/ai_chat/ai_chat_ui_browsertest.cc index 3fb573f5a5a..332afe297d4 100644 --- a/browser/ai_chat/ai_chat_ui_browsertest.cc +++ b/browser/ai_chat/ai_chat_ui_browsertest.cc @@ -181,7 +181,7 @@ class AIChatUIBrowserTest : public InProcessBrowserTest, auto* side_panel_ui = browser()->GetFeatures().side_panel_ui(); side_panel_ui->Show(SidePanelEntryId::kChatUI); auto* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); - auto* side_panel = browser_view->toolbar_height_side_panel(); + auto* side_panel = browser_view->side_panel(); auto* ai_chat_side_panel = side_panel->GetViewByID(SidePanelWebUIView::kSidePanelWebViewId); ASSERT_TRUE(ai_chat_side_panel); @@ -371,7 +371,7 @@ IN_PROC_BROWSER_TEST_P(AIChatUIBrowserTest, WebContentsShouldBeFocused) { auto* side_panel_ui = browser()->GetFeatures().side_panel_ui(); side_panel_ui->Show(SidePanelEntryId::kChatUI); auto* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); - auto* side_panel = browser_view->toolbar_height_side_panel(); + auto* side_panel = browser_view->side_panel(); auto* ai_chat_side_panel = static_cast( side_panel->GetViewByID(SidePanelWebUIView::kSidePanelWebViewId)); ASSERT_TRUE(ai_chat_side_panel); diff --git a/browser/ui/brave_browser_command_controller_browsertest.cc b/browser/ui/brave_browser_command_controller_browsertest.cc index 247d80729f0..1f50ac31ad3 100644 --- a/browser/ui/brave_browser_command_controller_browsertest.cc +++ b/browser/ui/brave_browser_command_controller_browsertest.cc @@ -197,7 +197,7 @@ class BraveBrowserCommandControllerTest : public InProcessBrowserTest { #if defined(TOOLKIT_VIEWS) void WaitForSidePanelClose() { ASSERT_TRUE(base::test::RunUntil([&]() { - return browser()->GetBrowserView().toolbar_height_side_panel()->state() == + return browser()->GetBrowserView().side_panel()->state() == SidePanel::State::kClosed; })); } @@ -508,7 +508,7 @@ IN_PROC_BROWSER_TEST_F(BraveBrowserCommandControllerTest, SidePanelEntry::Key(SidePanelEntryId::kChatUI); auto* side_panel_coordinator = SidePanelCoordinator::From(browser()); ASSERT_TRUE(base::test::RunUntil([&]() { - return browser()->GetBrowserView().toolbar_height_side_panel()->state() == + return browser()->GetBrowserView().side_panel()->state() == SidePanel::State::kClosed; })); diff --git a/browser/ui/sidebar/sidebar_browsertest.cc b/browser/ui/sidebar/sidebar_browsertest.cc index 7328338c6d7..038f41e6433 100644 --- a/browser/ui/sidebar/sidebar_browsertest.cc +++ b/browser/ui/sidebar/sidebar_browsertest.cc @@ -2029,7 +2029,7 @@ INSTANTIATE_TEST_SUITE_P( // Covers both the default right-side and the explicitly set left-side layouts. IN_PROC_BROWSER_TEST_F(SidebarBrowserTest, SidebarV2PanelPositionTest) { auto* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); - auto* panel = browser_view->toolbar_height_side_panel(); + auto* panel = browser_view->side_panel(); panel->DisableAnimationsForTesting(); SidebarContainerView* sidebar = GetSidebarContainerView(); auto* prefs = browser()->profile()->GetPrefs(); @@ -2137,7 +2137,7 @@ IN_PROC_BROWSER_TEST_F(SidebarBrowserTest, SidebarV2ActiveItemStateSync) { IN_PROC_BROWSER_TEST_F(SidebarBrowserTest, SidebarV2BraveHeaderTest) { auto* panel_ui = browser()->GetFeatures().side_panel_ui(); auto* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); - auto* side_panel = browser_view->toolbar_height_side_panel(); + auto* side_panel = browser_view->side_panel(); side_panel->DisableAnimationsForTesting(); // Reading list: Brave header attached. @@ -2178,7 +2178,7 @@ IN_PROC_BROWSER_TEST_F(SidebarBrowserTest, SidebarV2ResizeAreaPositionMatchesBorderState) { auto* panel_ui = browser()->GetFeatures().side_panel_ui(); auto* browser_view = BrowserView::GetBrowserViewForBrowser(browser()); - auto* side_panel = browser_view->toolbar_height_side_panel(); + auto* side_panel = browser_view->side_panel(); side_panel->DisableAnimationsForTesting(); auto* prefs = browser()->profile()->GetPrefs(); diff --git a/browser/ui/views/frame/brave_browser_view_browsertest.cc b/browser/ui/views/frame/brave_browser_view_browsertest.cc index f44a1fba296..5c678b39e42 100644 --- a/browser/ui/views/frame/brave_browser_view_browsertest.cc +++ b/browser/ui/views/frame/brave_browser_view_browsertest.cc @@ -341,7 +341,7 @@ IN_PROC_BROWSER_TEST_P(BraveBrowserViewWithRoundedCornersTest, RunScheduledLayouts(); views::View* contents_container = browser_view()->contents_container(); - views::View* side_panel = browser_view()->toolbar_height_side_panel(); + views::View* side_panel = browser_view()->side_panel(); const auto rounded_corners_margin = BraveContentsViewUtil::kMarginThickness; const auto rounded_corners_border_radius = GetRoundedCornersBorderRadius(); const auto rounded_corners_border_radius_at_window_corner = @@ -416,7 +416,7 @@ IN_PROC_BROWSER_TEST_P(BraveBrowserViewWithRoundedCornersTest, RunScheduledLayouts(); views::View* contents_container = browser_view()->contents_container(); - views::View* side_panel = browser_view()->toolbar_height_side_panel(); + views::View* side_panel = browser_view()->side_panel(); const auto rounded_corners_margin = BraveContentsViewUtil::kMarginThickness; const auto rounded_corners_border_radius = GetRoundedCornersBorderRadius(); const auto rounded_corners_border_radius_at_window_corner = @@ -465,7 +465,7 @@ IN_PROC_BROWSER_TEST_P(BraveBrowserViewWithRoundedCornersTest, RunScheduledLayouts(); views::View* contents_container = browser_view()->contents_container(); - views::View* side_panel = browser_view()->toolbar_height_side_panel(); + views::View* side_panel = browser_view()->side_panel(); const auto rounded_corners_margin = BraveContentsViewUtil::kMarginThickness; const auto rounded_corners_border_radius = GetRoundedCornersBorderRadius(); const auto rounded_corners_border_radius_at_window_corner = diff --git a/browser/ui/views/frame/layout/brave_browser_view_tabbed_layout_impl.cc b/browser/ui/views/frame/layout/brave_browser_view_tabbed_layout_impl.cc index cf081a99385..9b740779b87 100644 --- a/browser/ui/views/frame/layout/brave_browser_view_tabbed_layout_impl.cc +++ b/browser/ui/views/frame/layout/brave_browser_view_tabbed_layout_impl.cc @@ -480,7 +480,7 @@ void BraveBrowserViewTabbedLayoutImpl::CalculateSideBarLayout( panel_layout->bounds.set_y(contents_bounds.y()); panel_layout->bounds.set_height(contents_bounds.height()); }; - adjust_panel(views().toolbar_height_side_panel.get()); + adjust_panel(views().side_panel.get()); // Reduce contents bounds by the sidebar width on the sidebar side. if (on_left) { diff --git a/browser/ui/views/side_panel/brave_side_panel_coordinator.cc b/browser/ui/views/side_panel/brave_side_panel_coordinator.cc index 203c618900a..6cb8e41e272 100644 --- a/browser/ui/views/side_panel/brave_side_panel_coordinator.cc +++ b/browser/ui/views/side_panel/brave_side_panel_coordinator.cc @@ -102,8 +102,7 @@ void BraveSidePanelCoordinator::OnActiveTabChanged( } void BraveSidePanelCoordinator::Toggle() { - if (IsSidePanelShowing() && - !browser_view_->toolbar_height_side_panel()->IsClosing()) { + if (IsSidePanelShowing() && !browser_view_->side_panel()->IsClosing()) { SidePanelCoordinator::Close(); } else if (const auto key = GetLastActiveEntryKey()) { SidePanelUIBase::Show(*key, SidePanelOpenTrigger::kToolbarButton);