diff --git a/android/java/org/chromium/base/BraveFeatureList.java b/android/java/org/chromium/base/BraveFeatureList.java index b38eff6130c..00621441fa3 100644 --- a/android/java/org/chromium/base/BraveFeatureList.java +++ b/android/java/org/chromium/base/BraveFeatureList.java @@ -27,4 +27,5 @@ public abstract class BraveFeatureList { public static final String BRAVE_SPEEDREADER = "Speedreader"; public static final String HTTPS_BY_DEFAULT = "HttpsByDefault"; public static final String BRAVE_FORGET_FIRST_PARTY_STORAGE = "BraveForgetFirstPartyStorage"; + public static final String BRAVE_REQUEST_OTR_TAB = "BraveRequestOTRTab"; } diff --git a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java index de73e69f551..3605e614f12 100644 --- a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java +++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java @@ -694,8 +694,6 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE getActivity().getResources().getString(R.string.block_fingerprinting_option_3)); } - updateRequestOtrPref(); - if (httpsUpgradePref.equals(BraveShieldsContentSettings.BLOCK_RESOURCE)) { mHttpsUpgradePref.setCheckedIndex(0); mHttpsUpgradePref.setSummary( @@ -800,6 +798,12 @@ public class BravePrivacySettings extends PrivacySettings implements ConnectionE if (!ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_WALLET_SNS)) { removePreferenceIfPresent(PREF_SNS); } + + if (!ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REQUEST_OTR_TAB)) { + removePreferenceIfPresent(PREF_REQUEST_OTR); + } else { + updateRequestOtrPref(); + } } private void updateRequestOtrPref() { diff --git a/android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java b/android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java index df031098401..ea06580ca7c 100644 --- a/android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java +++ b/android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java @@ -44,7 +44,7 @@ public class BravePrivacySettingsTest { private static final String PREF_INCOGNITO_LOCK = "incognito_lock"; private static final String PREF_PHONE_AS_A_SECURITY_KEY = "phone_as_a_security_key"; - private static final int BRAVE_PRIVACY_SETTINGS_NUMBER_OF_ITEMS = 30; + private static final int BRAVE_PRIVACY_SETTINGS_NUMBER_OF_ITEMS = 29; private int mItemsLeft; diff --git a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc index 1077c2aea96..b5cd3e4b7b4 100644 --- a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc @@ -15,6 +15,7 @@ #include "brave/components/debounce/common/features.h" #include "brave/components/google_sign_in_permission/features.h" #include "brave/components/playlist/common/features.h" +#include "brave/components/request_otr/common/features.h" #include "brave/components/speedreader/common/features.h" #include "net/base/features.h" #include "third_party/blink/public/common/features.h" @@ -30,6 +31,7 @@ &brave_wallet::features::kBraveWalletSnsFeature, \ &playlist::features::kPlaylist, \ &preferences::features::kBraveBackgroundVideoPlayback, \ + &request_otr::features::kBraveRequestOTRTab, \ &safe_browsing::features::kBraveAndroidSafeBrowsing, \ &speedreader::kSpeedreaderFeature, \ &debounce::features::kBraveDebounce, \