Remove kBraveWalletDappsSupportFeature flag

This commit is contained in:
Jocelyn Liu
2023-11-10 08:18:12 -08:00
parent 2cbca614e2
commit 53d66c3ef5
6 changed files with 3 additions and 23 deletions
-8
View File
@@ -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", \
+3 -4
View File
@@ -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::mojom::DefaultWallet>(
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;
@@ -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);
}
@@ -26,7 +26,6 @@ bool IsFilecoinEnabled();
bool IsSolanaEnabled();
bool IsNftPinningEnabled();
bool ShouldCreateDefaultSolanaAccount();
bool IsDappsSupportEnabled();
bool IsBitcoinEnabled();
bool IsZCashEnabled();
bool IsAnkrBalancesEnabled();
@@ -24,10 +24,6 @@ BASE_FEATURE(kBraveWalletSolanaFeature,
const base::FeatureParam<bool> kCreateDefaultSolanaAccount{
&kBraveWalletSolanaFeature, "create_default_solana_account", true};
BASE_FEATURE(kBraveWalletDappsSupportFeature,
"BraveWalletDappsSupport",
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kBraveWalletNftPinningFeature,
"BraveWalletNftPinning",
@@ -17,7 +17,6 @@ BASE_DECLARE_FEATURE(kBraveWalletFilecoinFeature);
BASE_DECLARE_FEATURE(kBraveWalletSolanaFeature);
BASE_DECLARE_FEATURE(kBraveWalletNftPinningFeature);
extern const base::FeatureParam<bool> kCreateDefaultSolanaAccount;
BASE_DECLARE_FEATURE(kBraveWalletDappsSupportFeature);
BASE_DECLARE_FEATURE(kBraveWalletBitcoinFeature);
extern const base::FeatureParam<int> kBitcoinRpcThrottle;
extern const base::FeatureParam<bool> kBitcoinTestnetDiscovery;