Claudio DeSouza
21090e4476
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}
136 lines
4.8 KiB
C++
136 lines
4.8 KiB
C++
/* Copyright (c) 2019 The Brave Authors. All rights reserved.
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
|
* You can obtain one at https://mozilla.org/MPL/2.0/. */
|
|
|
|
#ifndef BRAVE_BROWSER_UI_BRAVE_BROWSER_COMMAND_CONTROLLER_H_
|
|
#define BRAVE_BROWSER_UI_BRAVE_BROWSER_COMMAND_CONTROLLER_H_
|
|
|
|
#include <optional>
|
|
#include <string>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
#include "base/memory/raw_ref.h"
|
|
#include "base/scoped_observation.h"
|
|
#include "brave/browser/ui/tabs/split_view_browser_data.h"
|
|
#include "brave/browser/ui/tabs/split_view_browser_data_observer.h"
|
|
#include "brave/components/brave_vpn/common/buildflags/buildflags.h"
|
|
#include "brave/components/tor/buildflags/buildflags.h"
|
|
#include "chrome/browser/ui/browser_command_controller.h"
|
|
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
|
#include "components/prefs/pref_change_registrar.h"
|
|
|
|
#if BUILDFLAG(ENABLE_BRAVE_VPN)
|
|
#include "brave/components/brave_vpn/browser/brave_vpn_service_observer.h"
|
|
#endif
|
|
|
|
class BraveAppMenuBrowserTest;
|
|
class BraveAppMenuModelBrowserTest;
|
|
class BraveBrowserCommandControllerTest;
|
|
enum class TabChangeType;
|
|
|
|
namespace content {
|
|
class WebContents;
|
|
}
|
|
|
|
// This namespace is needed for a chromium_src override
|
|
namespace chrome {
|
|
|
|
class BraveBrowserCommandController : public chrome::BrowserCommandController,
|
|
public SplitViewBrowserDataObserver
|
|
#if BUILDFLAG(ENABLE_BRAVE_VPN)
|
|
,
|
|
public brave_vpn::BraveVPNServiceObserver
|
|
#endif
|
|
{
|
|
public:
|
|
explicit BraveBrowserCommandController(BrowserWindowInterface* bwi);
|
|
BraveBrowserCommandController(const BraveBrowserCommandController&) = delete;
|
|
BraveBrowserCommandController& operator=(
|
|
const BraveBrowserCommandController&) = delete;
|
|
~BraveBrowserCommandController() override;
|
|
|
|
#if BUILDFLAG(ENABLE_TOR)
|
|
void UpdateCommandForTor();
|
|
#endif
|
|
|
|
protected:
|
|
void TabChangedAt(content::WebContents* contents,
|
|
int index,
|
|
TabChangeType change) override;
|
|
void TabPinnedStateChanged(TabStripModel* tab_strip_model,
|
|
content::WebContents* contents,
|
|
int index) override;
|
|
void OnTabStripModelChanged(
|
|
TabStripModel* tab_strip_model,
|
|
const TabStripModelChange& change,
|
|
const TabStripSelectionChange& selection) override;
|
|
void OnTabGroupChanged(const TabGroupChange& change) override;
|
|
void OnSplitTabChanged(const SplitTabChange& change) override;
|
|
|
|
private:
|
|
friend class ::BraveAppMenuBrowserTest;
|
|
friend class ::BraveAppMenuModelBrowserTest;
|
|
friend class ::BraveBrowserCommandControllerTest;
|
|
|
|
// Overriden from SplitViewBrowserDataObserver:
|
|
void OnTileTabs(const TabTile& tile) override;
|
|
void OnWillBreakTile(const TabTile& tile) override;
|
|
void OnWillDeleteBrowserData() override;
|
|
|
|
// Overriden from CommandUpdater:
|
|
bool SupportsCommand(int id) const override;
|
|
bool IsCommandEnabled(int id) const override;
|
|
bool ExecuteCommandWithDisposition(
|
|
int id,
|
|
WindowOpenDisposition disposition,
|
|
base::TimeTicks time_stamp = base::TimeTicks::Now()) override;
|
|
void AddCommandObserver(int id, CommandObserver* observer) override;
|
|
void RemoveCommandObserver(int id, CommandObserver* observer) override;
|
|
void RemoveCommandObserver(CommandObserver* observer) override;
|
|
bool UpdateCommandEnabled(int id, bool state) override;
|
|
|
|
#if BUILDFLAG(ENABLE_BRAVE_VPN)
|
|
// brave_vpn::BraveVPNServiceObserver overrides:
|
|
void OnPurchasedStateChanged(
|
|
brave_vpn::mojom::PurchasedState state,
|
|
const std::optional<std::string>& description) override;
|
|
#endif
|
|
|
|
void InitBraveCommandState();
|
|
void UpdateCommandForBraveRewards();
|
|
void UpdateCommandForWebcompatReporter();
|
|
void UpdateCommandForBraveSync();
|
|
void UpdateCommandForBraveWallet();
|
|
void UpdateCommandForSidebar();
|
|
void UpdateCommandForAIChat();
|
|
void UpdateCommandForBraveVPN();
|
|
void UpdateCommandForPlaylist();
|
|
void UpdateCommandForWaybackMachine();
|
|
void UpdateCommandsForTabs();
|
|
void UpdateCommandsForSend();
|
|
void UpdateCommandsForPin();
|
|
void UpdateCommandForSplitView();
|
|
|
|
// Rename to UpdateCommandForSplitView when we enable
|
|
// SideBySide by default.
|
|
void UpdateCommandForSplitViewWithSideBySide();
|
|
|
|
bool ExecuteBraveCommandWithDisposition(int id,
|
|
WindowOpenDisposition disposition,
|
|
base::TimeTicks time_stamp);
|
|
|
|
PrefChangeRegistrar pref_change_registrar_;
|
|
const raw_ref<Browser> browser_;
|
|
|
|
CommandUpdaterImpl brave_command_updater_;
|
|
|
|
base::ScopedObservation<SplitViewBrowserData, SplitViewBrowserDataObserver>
|
|
split_view_browser_data_observation_{this};
|
|
};
|
|
|
|
} // namespace chrome
|
|
|
|
#endif // BRAVE_BROWSER_UI_BRAVE_BROWSER_COMMAND_CONTROLLER_H_
|