From 907a7c60fa9af4b489fb74795415ee270d341f50 Mon Sep 17 00:00:00 2001
From: "Brian R. Bondy" <netzen@gmail.com>
Date: Tue, 10 Feb 2026 13:00:13 -0500
Subject: [PATCH] Add missing buildflag guards to Origin settings page (#33812)

Only Speedreader had an <if expr> guard. Add guards for all
feature toggles so they don't render when compiled out.

Resolves https://github.com/brave/brave-browser/issues/52687
---
 browser/resources/settings/BUILD.gn           |   6 +
 .../brave_origin_page/brave_origin_page.html  | 114 ++++++++++--------
 2 files changed, 72 insertions(+), 48 deletions(-)

diff --git a/browser/resources/settings/BUILD.gn b/browser/resources/settings/BUILD.gn
index 4190dd9549d..1f7fa049540 100644
--- a/browser/resources/settings/BUILD.gn
+++ b/browser/resources/settings/BUILD.gn
@@ -7,6 +7,9 @@ import("//brave/browser/shell_integrations/buildflags/buildflags.gni")
 import("//brave/build/config.gni")
 import("//brave/components/ai_chat/core/common/buildflags/buildflags.gni")
 import("//brave/components/brave_ads/buildflags/buildflags.gni")
+import("//brave/components/brave_news/common/buildflags/buildflags.gni")
+import("//brave/components/brave_rewards/core/buildflags/buildflags.gni")
+import("//brave/components/brave_talk/buildflags/buildflags.gni")
 import("//brave/components/brave_vpn/common/buildflags/buildflags.gni")
 import("//brave/components/brave_wallet/common/buildflags/buildflags.gni")
 import("//brave/components/brave_wayback_machine/buildflags/buildflags.gni")
@@ -88,6 +91,9 @@ preprocess_if_expr("preprocess") {
   defines = [
     "enable_ai_chat=$enable_ai_chat",
     "enable_brave_ads=$enable_brave_ads",
+    "enable_brave_news=$enable_brave_news",
+    "enable_brave_rewards=$enable_brave_rewards",
+    "enable_brave_talk=$enable_brave_talk",
     "enable_tor=$enable_tor",
     "enable_brave_wayback_machine=$enable_brave_wayback_machine",
     "enable_brave_vpn=$enable_brave_vpn",
diff --git a/browser/resources/settings/brave_origin_page/brave_origin_page.html b/browser/resources/settings/brave_origin_page/brave_origin_page.html
index d4cb5a7f2ba..2fc77dd2520 100644
--- a/browser/resources/settings/brave_origin_page/brave_origin_page.html
+++ b/browser/resources/settings/brave_origin_page/brave_origin_page.html
@@ -29,14 +29,16 @@
     </div>
   </div>
 
-  <div class="cr-row title">$i18n{braveOriginSectionAdsTitle}</div>
+  <if expr="enable_brave_rewards">
+    <div class="cr-row title">$i18n{braveOriginSectionAdsTitle}</div>
 
-  <origin-toggle-button id="toggleRewardsButton"
-      policy-key="BraveRewardsDisabled"
-      inverted
-      label="$i18n{braveOriginRewardsToggleTitle}"
-      icon="product-bat-outline">
-  </origin-toggle-button>
+    <origin-toggle-button id="toggleRewardsButton"
+        policy-key="BraveRewardsDisabled"
+        inverted
+        label="$i18n{braveOriginRewardsToggleTitle}"
+        icon="product-bat-outline">
+    </origin-toggle-button>
+  </if>
 
   <div class="cr-row title">$i18n{braveOriginSectionAnalyticsTitle}</div>
 
@@ -52,20 +54,26 @@
       icon="bar-chart">
   </origin-toggle-button>
 
-  <div class="cr-row title">$i18n{braveOriginSectionFeaturesTitle}</div>
+  <if expr="enable_ai_chat or enable_brave_news or enable_speedreader or enable_brave_talk or enable_tor or enable_brave_vpn or enable_brave_wallet or enable_brave_wayback_machine">
+    <div class="cr-row title">$i18n{braveOriginSectionFeaturesTitle}</div>
+  </if>
 
-  <origin-toggle-button id="toggleLeoAiButton"
-      policy-key="BraveAIChatEnabled"
-      label="$i18n{braveOriginLeoAiToggleTitle}"
-      icon="product-brave-leo">
-  </origin-toggle-button>
+  <if expr="enable_ai_chat">
+    <origin-toggle-button id="toggleLeoAiButton"
+        policy-key="BraveAIChatEnabled"
+        label="$i18n{braveOriginLeoAiToggleTitle}"
+        icon="product-brave-leo">
+    </origin-toggle-button>
+  </if>
 
-  <origin-toggle-button id="toggleNewsButton"
-      policy-key="BraveNewsDisabled"
-      inverted
-      label="$i18n{braveOriginNewsToggleTitle}"
-      icon="product-brave-news">
-  </origin-toggle-button>
+  <if expr="enable_brave_news">
+    <origin-toggle-button id="toggleNewsButton"
+        policy-key="BraveNewsDisabled"
+        inverted
+        label="$i18n{braveOriginNewsToggleTitle}"
+        icon="product-brave-news">
+    </origin-toggle-button>
+  </if>
 
   <if expr="enable_speedreader">
     <origin-toggle-button id="toggleSpeedreaderButton"
@@ -75,39 +83,49 @@
     </origin-toggle-button>
   </if>
 
-  <origin-toggle-button id="toggleTalkButton"
-      policy-key="BraveTalkDisabled"
-      inverted
-      label="$i18n{braveOriginTalkToggleTitle}"
-      icon="product-brave-talk">
-  </origin-toggle-button>
+  <if expr="enable_brave_talk">
+    <origin-toggle-button id="toggleTalkButton"
+        policy-key="BraveTalkDisabled"
+        inverted
+        label="$i18n{braveOriginTalkToggleTitle}"
+        icon="product-brave-talk">
+    </origin-toggle-button>
+  </if>
 
-  <origin-toggle-button id="toggleTorWindowsButton"
-      policy-key="TorDisabled"
-      inverted
-      label="$i18n{braveOriginTorWindowsToggleTitle}"
-      icon="product-tor">
-  </origin-toggle-button>
+  <if expr="enable_tor">
+    <origin-toggle-button id="toggleTorWindowsButton"
+        policy-key="TorDisabled"
+        inverted
+        label="$i18n{braveOriginTorWindowsToggleTitle}"
+        icon="product-tor">
+    </origin-toggle-button>
+  </if>
 
-  <origin-toggle-button id="toggleVpnButton"
-      policy-key="BraveVPNDisabled"
-      inverted
-      label="$i18n{braveOriginVpnToggleTitle}"
-      icon="product-vpn">
-  </origin-toggle-button>
+  <if expr="enable_brave_vpn">
+    <origin-toggle-button id="toggleVpnButton"
+        policy-key="BraveVPNDisabled"
+        inverted
+        label="$i18n{braveOriginVpnToggleTitle}"
+        icon="product-vpn">
+    </origin-toggle-button>
+  </if>
 
-  <origin-toggle-button id="toggleWalletButton"
-      policy-key="BraveWalletDisabled"
-      inverted
-      label="$i18n{braveOriginWalletToggleTitle}"
-      icon="product-brave-wallet">
-  </origin-toggle-button>
+  <if expr="enable_brave_wallet">
+    <origin-toggle-button id="toggleWalletButton"
+        policy-key="BraveWalletDisabled"
+        inverted
+        label="$i18n{braveOriginWalletToggleTitle}"
+        icon="product-brave-wallet">
+    </origin-toggle-button>
+  </if>
 
-  <origin-toggle-button id="toggleWaybackMachineButton"
-      policy-key="BraveWaybackMachineEnabled"
-      label="$i18n{braveOriginWaybackMachineToggleTitle}"
-      icon="window-404">
-  </origin-toggle-button>
+  <if expr="enable_brave_wayback_machine">
+    <origin-toggle-button id="toggleWaybackMachineButton"
+        policy-key="BraveWaybackMachineEnabled"
+        label="$i18n{braveOriginWaybackMachineToggleTitle}"
+        icon="window-404">
+    </origin-toggle-button>
+  </if>
 
   <!-- TODO: Web Discovery policy not yet registered in Brave Origin
   <origin-toggle-button id="toggleWebDiscoveryProjectButton"