Update condition for DayZero flag changes

brave · Oct 22, 2024 · 9f37693 · 9f37693
1 parent 97e2174
commit 9f37693
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/android/java/org/chromium/chrome/browser/day_zero/DayZeroHelper.java b/android/java/org/chromium/chrome/browser/day_zero/DayZeroHelper.java
@@ -13,7 +13,7 @@
 import org.chromium.chrome.browser.preferences.ChromeSharedPreferences;
 
 public class DayZeroHelper {
-    private static final String TAG = "DayZeroMojomHelper";
+    private static final String TAG = "DayZeroHelper";
 
     @CalledByNative
     private static void setDayZeroExptAndroid(boolean shouldShowFeatures) {

diff --git a/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java b/android/java/org/chromium/chrome/browser/firstrun/WelcomeOnboardingActivity.java
@@ -35,15 +35,14 @@
 import com.android.installreferrer.api.InstallReferrerStateListener;
 import com.android.installreferrer.api.ReferrerDetails;
 
-import org.chromium.base.BraveFeatureList;
 import org.chromium.base.BravePreferenceKeys;
 import org.chromium.base.Log;
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.BraveLocalState;
 import org.chromium.chrome.browser.back_press.SecondaryActivityBackPressUma.SecondaryActivity;
 import org.chromium.chrome.browser.customtabs.CustomTabActivity;
-import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.day_zero.DayZeroHelper;
 import org.chromium.chrome.browser.metrics.ChangeMetricsReportingStateCalledFrom;
 import org.chromium.chrome.browser.metrics.UmaSessionStats;
 import org.chromium.chrome.browser.onboarding.OnboardingPrefManager;
@@ -238,12 +237,11 @@ private void onClickViews() {
     }
 
     private boolean shouldForceDefaultBrowserPrompt() {
-        return ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_DAY_ZERO_EXPERIMENT)
-                && !isDefaultBrowser();
+        return !DayZeroHelper.getDayZeroExptFlag() && !isDefaultBrowser();
     }
 
     private boolean shouldOfferSearchWidget() {
-        return ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_DAY_ZERO_EXPERIMENT)
+        return !DayZeroHelper.getDayZeroExptFlag()
                 && BraveSearchWidgetUtils.getShouldShowWidgetPromo(this);
     }
 

diff --git a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc
@@ -5,8 +5,6 @@
 
 #include "base/feature_override.h"
 #include "brave/browser/android/background_video/features.h"
-#include "brave/browser/android/first_run/features.h"
-#include "brave/browser/android/preferences/features.h"
 #include "brave/browser/android/safe_browsing/features.h"
 #include "brave/browser/brave_browser_features.h"
 #include "brave/components/ai_chat/core/common/buildflags/buildflags.h"