Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[cr149] toolbar_height_side_panel() now just side_panel()

Browse Source 
This is an accessor renaming for `BrowserView` and
`BrowserViewLayoutViews`.

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/49935f86367082b50b34fc7be3ead05a6a642e0c

commit 49935f86367082b50b34fc7be3ead05a6a642e0c
Author: Caroline Rising <corising@chromium.org>
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 <estalin@chromium.org>
    Commit-Queue: Caroline Rising <corising@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1623866}
This commit is contained in:
Claudio DeSouza
2026-05-22 16:57:32 -04:00
committed by Max Karolinskiy
parent b9b1ce9657
commit 4e1567324e
7 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/ai_chat/ai_chat_sidepanel_behavior_browsertest.cc
+1 -1
View File
@@ -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);
browser/ai_chat/ai_chat_ui_browsertest.cc
+2 -2
View File
@@ -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<views::WebView*>(
side_panel->GetViewByID(SidePanelWebUIView::kSidePanelWebViewId));
ASSERT_TRUE(ai_chat_side_panel);
browser/ui/brave_browser_command_controller_browsertest.cc
+2 -2
View File
@@ -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;
}));
browser/ui/sidebar/sidebar_browsertest.cc
+3 -3
View File
@@ -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();
browser/ui/views/frame/brave_browser_view_browsertest.cc
+3 -3
View File
@@ -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 =
browser/ui/views/frame/layout/brave_browser_view_tabbed_layout_impl.cc
+1 -1
View File
@@ -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) {
browser/ui/views/side_panel/brave_side_panel_coordinator.cc
+1 -2
View File
@@ -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);