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

Fix enable_brave_wayback_machine=false builds (#31810)

Browse Source
This commit is contained in:
Brian R. Bondy
2025-10-15 14:05:07 -04:00
committed by GitHub
parent ba3005b6f8
commit 10b52ba035
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
chromium_src/chrome/browser/ui/views/page_action/DEPS
+1
View File
@@ -1,4 +1,5 @@
include_rules = [
"+brave/components/brave_wayback_machine/buildflags",
"+brave/components/playlist/core/common/buildflags",
"+brave/components/speedreader/common/buildflags",
]
chromium_src/chrome/browser/ui/views/page_action/page_action_icon_controller.cc
+17 -5
View File
@@ -5,12 +5,16 @@
#include "brave/browser/ui/page_action/brave_page_action_icon_type.h"
#include "brave/browser/ui/views/location_bar/brave_star_view.h"
#include "brave/browser/ui/views/page_action/wayback_machine_action_icon_view.h"
#include "brave/components/brave_wayback_machine/buildflags/buildflags.h"
#include "brave/components/playlist/core/common/buildflags/buildflags.h"
#include "brave/components/speedreader/common/buildflags/buildflags.h"
#include "chrome/browser/ui/page_action/page_action_icon_type.h"
#include "chrome/browser/ui/views/page_action/page_action_icon_view.h"
#if BUILDFLAG(ENABLE_BRAVE_WAYBACK_MACHINE)
#include "brave/browser/ui/views/page_action/wayback_machine_action_icon_view.h"
#endif
#if BUILDFLAG(ENABLE_PLAYLIST_WEBUI)
#include "brave/browser/ui/views/playlist/playlist_action_icon_view.h"
constexpr bool kSupportsPlaylistActionIconView = true;
@@ -25,6 +29,16 @@ constexpr bool kSupportsSpeedreaderActionIconView = true;
constexpr bool kSupportsSpeedreaderActionIconView = false;
#endif
#if BUILDFLAG(ENABLE_BRAVE_WAYBACK_MACHINE)
#define BRAVE_WAYBACK_MACHINE_PAGE_ACTION \
add_page_action_icon(type, std::make_unique<WaybackMachineActionIconView>( \
params.command_updater, params.browser, \
params.icon_label_bubble_delegate, \
params.page_action_icon_delegate));
#else
#define BRAVE_WAYBACK_MACHINE_PAGE_ACTION
#endif
// Circumvent creation of CookieControlsIconView in
// PageActionIconController::Init's switch statement by injecting a case
// with a non-existent value created above.
@@ -41,10 +55,7 @@ constexpr bool kSupportsSpeedreaderActionIconView = false;
} \
break; \
case brave::kWaybackMachineActionIconType: \
add_page_action_icon(type, std::make_unique<WaybackMachineActionIconView>( \
params.command_updater, params.browser, \
params.icon_label_bubble_delegate, \
params.page_action_icon_delegate)); \
BRAVE_WAYBACK_MACHINE_PAGE_ACTION \
break; \
case brave::kSpeedreaderPageActionIconType: \
if constexpr (kSupportsSpeedreaderActionIconView) { \
@@ -73,6 +84,7 @@ constexpr bool kSupportsSpeedreaderActionIconView = false;
#undef StarView
#undef kShown
#undef kCookieControls
#undef BRAVE_WAYBACK_MACHINE_PAGE_ACTION
PageActionIconView* PageActionIconController::GetPlaylistActionIconView() {
return playlist_action_icon_view_.get();