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

[cr140] BrowserCommandController owned by BrowserWindowFeatures

Browse Source 
This class is overriden in Brave, and therefore requires a substitution
during instantiation. This substitution has moved from `Browser` and
into `BrowserWindowFeatures`.

Chromium changes:
https://chromium.googlesource.com/chromium/src/+/58bd9542429a22cf1ce4b8913933a22e69de7284

commit 58bd9542429a22cf1ce4b8913933a22e69de7284
Author: Alex Carutasu <alcaruta@microsoft.com>
Date:   Tue Jul 29 16:56:25 2025 -0700

    [bedrock] Migrate BrowserCommandController to BrowserWindowFeatures

    This CL moves BrowserCommandController ownership from Browser to
    BrowserWindowFeatures.

    Notes:
    - BrowserCommandController is now destroyed during the destruction of
    BrowserWindowFeatures, so resetting the BrowserCommandController field
    manually in its owner's destructor is no longer necessary since
    ~Browser()'s body already explicitly resets BrowserWindowFeatures.

    - I also removed a couple stale friended test classes from browser.h
    that were related to BrowserCommandController.

    Bug: 431668289
    Change-Id: I08df68363b64e03331708341081cace90aa2a60b
    Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6785957
    Reviewed-by: Tom Lukaszewicz <tluk@chromium.org>
    Reviewed-by: Keren Zhu <kerenzhu@chromium.org>
    Commit-Queue: Alex Carutasu <alcaruta@microsoft.com>
    Cr-Commit-Position: refs/heads/main@{#1493873}
This commit is contained in:
Claudio DeSouza
2025-08-19 19:54:33 +01:00
parent f9c65b8ff3
commit 21090e4476
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browser/ui/brave_browser_command_controller.cc
+4 -3
View File
@@ -93,9 +93,10 @@ bool IsBraveOverrideCommands(int id) {
namespace chrome {
BraveBrowserCommandController::BraveBrowserCommandController(Browser* browser)
: BrowserCommandController(browser),
browser_(*browser),
BraveBrowserCommandController::BraveBrowserCommandController(
BrowserWindowInterface* bwi)
: BrowserCommandController(bwi),
browser_(*bwi->GetBrowserForMigrationOnly()),
brave_command_updater_(nullptr) {
InitBraveCommandState();
#if BUILDFLAG(ENABLE_BRAVE_VPN)
browser/ui/brave_browser_command_controller.h
+1 -1
View File
@@ -45,7 +45,7 @@ class BraveBrowserCommandController : public chrome::BrowserCommandController,
#endif
{
public:
explicit BraveBrowserCommandController(Browser* browser);
explicit BraveBrowserCommandController(BrowserWindowInterface* bwi);
BraveBrowserCommandController(const BraveBrowserCommandController&) = delete;
BraveBrowserCommandController& operator=(
const BraveBrowserCommandController&) = delete;
chromium_src/chrome/browser/ui/browser.cc
-3
View File
@@ -4,14 +4,12 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "brave/browser/ui/brave_browser.h"
#include "brave/browser/ui/brave_browser_command_controller.h"
#include "brave/browser/ui/brave_tab_strip_model_delegate.h"
#include "brave/browser/ui/tabs/brave_tab_strip_model.h"
#include "chrome/browser/ui/browser_command_controller.h"
#define BRAVE_BROWSER_CREATE return new BraveBrowser(params);
#define BrowserCommandController BraveBrowserCommandController
#define BrowserTabStripModelDelegate BraveTabStripModelDelegate
#define DeprecatedCreateOwnedForTesting DeprecatedCreateOwnedForTesting_Unused
@@ -19,7 +17,6 @@
#undef DeprecatedCreateOwnedForTesting
#undef BrowserTabStripModelDelegate
#undef BrowserCommandController
#undef BRAVE_BROWSER_DEPRECATED_CREATE_OWNED_FOR_TESTING
#undef BRAVE_BROWSER_CREATE
chromium_src/chrome/browser/ui/browser_window/internal/browser_window_features.cc
+7
View File
@@ -6,6 +6,7 @@
#include "chrome/browser/ui/browser_window/public/browser_window_features.h"
#include "brave/browser/ui/brave_browser_actions.h"
#include "brave/browser/ui/brave_browser_command_controller.h"
#include "brave/browser/ui/brave_browser_content_setting_bubble_model_delegate.h"
#include "brave/browser/ui/toolbar/brave_location_bar_model_delegate.h"
#include "brave/browser/ui/views/side_panel/bookmarks/brave_bookmarks_side_panel_coordinator.h"
@@ -14,6 +15,10 @@
#include "chrome/browser/ui/views/side_panel/bookmarks/bookmarks_side_panel_coordinator.h"
#include "chrome/browser/ui/views/side_panel/history_clusters/history_clusters_side_panel_coordinator.h"
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/extension_browser_window_helper.h"
#endif
#define BrowserContentSettingBubbleModelDelegate \
BraveBrowserContentSettingBubbleModelDelegate
#define BrowserLocationBarModelDelegate BraveLocationBarModelDelegate
@@ -21,6 +26,7 @@
#define SidePanelCoordinator BraveSidePanelCoordinator
#define BookmarksSidePanelCoordinator BraveBookmarksSidePanelCoordinator
#define BrowserActions BraveBrowserActions
#define BrowserCommandController BraveBrowserCommandController
#include <chrome/browser/ui/browser_window/internal/browser_window_features.cc>
@@ -30,3 +36,4 @@
#undef BrowserLocationBarModelDelegate
#undef BrowserContentSettingBubbleModelDelegate
#undef BrowserActions
#undef BrowserCommandController