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

[cr143] Reanchor BraveSidePanelCoordinator overrides

Browse Source 
The keywords being used for `SidePanelCoordinator` and `SidePanelUIBase`
are gone now, which broke our overrides.

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/7e0bb317919a4f091f4f6c2366a74c8f7f2c3265

commit 7e0bb317919a4f091f4f6c2366a74c8f7f2c3265
Author: Caroline Rising <corising@chromium.org>
Date:   Mon Oct 20 11:34:45 2025 -0700

    Add sidepanel struct for PanelType specific data and create a map from type to data

    For now all accessors use kContent PanelType, all methods requiring a
    PanelType will be updated in subsequent CLs

    Bug: 445442616
    Change-Id: I5e85aa7c0c373c05c5284b76a79a2914e2ca9f56
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7050682
    Reviewed-by: Eshwar Stalin <estalin@chromium.org>
    Reviewed-by: David Pennington <dpenning@chromium.org>
    Commit-Queue: Caroline Rising <corising@chromium.org>
    Cr-Commit-Position: refs/heads/main@{#1532417}
This commit is contained in:
Claudio DeSouza
2025-11-18 11:26:24 -05:00
committed by Max Karolinskiy
parent 7b7a687a5f
commit 60c401ccd3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/ui/views/side_panel/brave_side_panel_coordinator.cc
+1 -1
View File
@@ -94,7 +94,7 @@ void BraveSidePanelCoordinator::OnViewVisibilityChanged(
// See the comment of SidePanelCoordinator::OnViewVisibilityChanged()
// about this condition.
bool update_items_state = true;
if (observed_view->GetVisible() || !current_key_) {
if (observed_view->GetVisible() || !current_key()) {
update_items_state = false;
}
chromium_src/chrome/browser/ui/views/side_panel/side_panel_coordinator.h
+4 -4
View File
@@ -21,12 +21,12 @@
#include "chrome/browser/ui/views/side_panel/side_panel_util.h"
#include "ui/views/view_observer.h"
#define UpdatePinState \
UpdatePinState_UnUsed(); \
#define ClearCachedEntryViews \
ClearCachedEntryViews_UnUsed(); \
friend class BraveSidePanelCoordinator; \
void UpdatePinState
void ClearCachedEntryViews
#include <chrome/browser/ui/views/side_panel/side_panel_coordinator.h> // IWYU pragma: export
#undef UpdatePinState
#undef ClearCachedEntryViews
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_SIDE_PANEL_SIDE_PANEL_COORDINATOR_H_
chromium_src/chrome/browser/ui/views/side_panel/side_panel_ui_base.h
+3 -3
View File
@@ -13,13 +13,13 @@ class BraveSidePanelCoordinator;
// the private current_key_ member variable.
// Inheritance:
// BraveSidePanelCoordinator -> SidePanelCoordinator -> SidePanelUIBase
#define set_current_key \
#define SetCurrentKey \
Unused(); \
friend class BraveSidePanelCoordinator; \
void set_current_key
void SetCurrentKey
#include <chrome/browser/ui/views/side_panel/side_panel_ui_base.h> // IWYU pragma: export
#undef set_current_key
#undef SetCurrentKey
#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_UI_VIEWS_SIDE_PANEL_SIDE_PANEL_UI_BASE_H_