diff --git a/browser/about_flags.cc b/browser/about_flags.cc index 3aeb9531059..a58f166794d 100644 --- a/browser/about_flags.cc +++ b/browser/about_flags.cc @@ -242,14 +242,6 @@ FEATURE_VALUE_TYPE( \ brave_wallet::features::kBraveWalletBitcoinFeature), \ }, \ - { \ - "brave-wallet-dapps-support", \ - "Enable Brave Wallet Dapps support", \ - "Brave Wallet Dapps support", \ - kOsDesktop | kOsAndroid, \ - FEATURE_VALUE_TYPE( \ - brave_wallet::features::kBraveWalletDappsSupportFeature), \ - }, \ { \ "brave-wallet-enable-ankr-balances", \ "Enable Ankr balances", \ diff --git a/browser/profiles/brave_renderer_updater.cc b/browser/profiles/brave_renderer_updater.cc index 2b028b5bc38..ca2fb97ec61 100644 --- a/browser/profiles/brave_renderer_updater.cc +++ b/browser/profiles/brave_renderer_updater.cc @@ -14,7 +14,6 @@ #include "brave/components/brave_wallet/browser/keyring_service.h" #include "brave/components/brave_wallet/browser/pref_names.h" #include "brave/components/brave_wallet/common/brave_wallet.mojom.h" -#include "brave/components/brave_wallet/common/common_utils.h" #include "brave/components/constants/pref_names.h" #include "brave/components/de_amp/browser/de_amp_util.h" #include "brave/components/de_amp/common/pref_names.h" @@ -164,7 +163,7 @@ void BraveRendererUpdater::UpdateRenderer( static_cast( brave_wallet_ethereum_provider_.GetValue()); bool install_window_brave_ethereum_provider = - is_wallet_allowed_for_context_ && brave_wallet::IsDappsSupportEnabled() && + is_wallet_allowed_for_context_ && default_ethereum_wallet != brave_wallet::mojom::DefaultWallet::None; bool install_window_ethereum_provider = ((default_ethereum_wallet == @@ -172,7 +171,7 @@ void BraveRendererUpdater::UpdateRenderer( !should_ignore_brave_wallet_for_eth) || default_ethereum_wallet == brave_wallet::mojom::DefaultWallet::BraveWallet) && - is_wallet_allowed_for_context_ && brave_wallet::IsDappsSupportEnabled(); + is_wallet_allowed_for_context_; bool allow_overwrite_window_ethereum_provider = default_ethereum_wallet == brave_wallet::mojom::DefaultWallet::BraveWalletPreferExtension; @@ -185,7 +184,7 @@ void BraveRendererUpdater::UpdateRenderer( !should_ignore_brave_wallet_for_sol) || default_solana_wallet == brave_wallet::mojom::DefaultWallet::BraveWallet) && - is_wallet_allowed_for_context_ && brave_wallet::IsDappsSupportEnabled(); + is_wallet_allowed_for_context_; bool allow_overwrite_window_solana_provider = default_solana_wallet == brave_wallet::mojom::DefaultWallet::BraveWalletPreferExtension; diff --git a/components/brave_wallet/common/common_utils.cc b/components/brave_wallet/common/common_utils.cc index 1c5ef018453..f6eb793902b 100644 --- a/components/brave_wallet/common/common_utils.cc +++ b/components/brave_wallet/common/common_utils.cc @@ -38,11 +38,6 @@ bool IsFilecoinEnabled() { return base::FeatureList::IsEnabled(features::kBraveWalletFilecoinFeature); } -bool IsDappsSupportEnabled() { - return base::FeatureList::IsEnabled( - features::kBraveWalletDappsSupportFeature); -} - bool IsSolanaEnabled() { return base::FeatureList::IsEnabled(features::kBraveWalletSolanaFeature); } diff --git a/components/brave_wallet/common/common_utils.h b/components/brave_wallet/common/common_utils.h index 9658bef7088..ed43e6da4bc 100644 --- a/components/brave_wallet/common/common_utils.h +++ b/components/brave_wallet/common/common_utils.h @@ -26,7 +26,6 @@ bool IsFilecoinEnabled(); bool IsSolanaEnabled(); bool IsNftPinningEnabled(); bool ShouldCreateDefaultSolanaAccount(); -bool IsDappsSupportEnabled(); bool IsBitcoinEnabled(); bool IsZCashEnabled(); bool IsAnkrBalancesEnabled(); diff --git a/components/brave_wallet/common/features.cc b/components/brave_wallet/common/features.cc index e4884c1e360..84dd8cb6f22 100644 --- a/components/brave_wallet/common/features.cc +++ b/components/brave_wallet/common/features.cc @@ -24,10 +24,6 @@ BASE_FEATURE(kBraveWalletSolanaFeature, const base::FeatureParam kCreateDefaultSolanaAccount{ &kBraveWalletSolanaFeature, "create_default_solana_account", true}; -BASE_FEATURE(kBraveWalletDappsSupportFeature, - "BraveWalletDappsSupport", - base::FEATURE_ENABLED_BY_DEFAULT); - BASE_FEATURE(kBraveWalletNftPinningFeature, "BraveWalletNftPinning", diff --git a/components/brave_wallet/common/features.h b/components/brave_wallet/common/features.h index 0e4650f02d1..e5366b9b132 100644 --- a/components/brave_wallet/common/features.h +++ b/components/brave_wallet/common/features.h @@ -17,7 +17,6 @@ BASE_DECLARE_FEATURE(kBraveWalletFilecoinFeature); BASE_DECLARE_FEATURE(kBraveWalletSolanaFeature); BASE_DECLARE_FEATURE(kBraveWalletNftPinningFeature); extern const base::FeatureParam kCreateDefaultSolanaAccount; -BASE_DECLARE_FEATURE(kBraveWalletDappsSupportFeature); BASE_DECLARE_FEATURE(kBraveWalletBitcoinFeature); extern const base::FeatureParam kBitcoinRpcThrottle; extern const base::FeatureParam kBitcoinTestnetDiscovery;