Remove cross promo dialog

android/brave_java_resources.gni

@@ -46,7 +46,6 @@ brave_java_resources = [
   "java/res/drawable-hdpi/ic_ad_free_videos.png",
   "java/res/drawable-hdpi/ic_brave_onboarding.png",
   "java/res/drawable-hdpi/ic_chrome.png",
-  "java/res/drawable-hdpi/ic_cross_modal.png",
   "java/res/drawable-hdpi/ic_delete_white_24dp.png",
   "java/res/drawable-hdpi/ic_expand_less_black_24dp.png",
   "java/res/drawable-hdpi/ic_expand_more_black_24dp.png",
@@ -103,7 +102,6 @@ brave_java_resources = [
   "java/res/drawable-mdpi/ic_ad_free_videos.png",
   "java/res/drawable-mdpi/ic_brave_onboarding.png",
   "java/res/drawable-mdpi/ic_chrome.png",
-  "java/res/drawable-mdpi/ic_cross_modal.png",
   "java/res/drawable-mdpi/ic_delete_white_24dp.png",
   "java/res/drawable-mdpi/ic_expand_less_black_24dp.png",
   "java/res/drawable-mdpi/ic_expand_more_black_24dp.png",
@@ -182,7 +180,6 @@ brave_java_resources = [
   "java/res/drawable-xhdpi/ic_ad_free_videos.png",
   "java/res/drawable-xhdpi/ic_brave_onboarding.png",
   "java/res/drawable-xhdpi/ic_chrome.png",
-  "java/res/drawable-xhdpi/ic_cross_modal.png",
   "java/res/drawable-xhdpi/ic_delete_white_24dp.png",
   "java/res/drawable-xhdpi/ic_expand_less_black_24dp.png",
   "java/res/drawable-xhdpi/ic_expand_more_black_24dp.png",
@@ -238,7 +235,6 @@ brave_java_resources = [
   "java/res/drawable-xxhdpi/ic_ad_free_videos.png",
   "java/res/drawable-xxhdpi/ic_brave_onboarding.png",
   "java/res/drawable-xxhdpi/ic_chrome.png",
-  "java/res/drawable-xxhdpi/ic_cross_modal.png",
   "java/res/drawable-xxhdpi/ic_delete_white_24dp.png",
   "java/res/drawable-xxhdpi/ic_expand_less_black_24dp.png",
   "java/res/drawable-xxhdpi/ic_expand_more_black_24dp.png",
@@ -293,7 +289,6 @@ brave_java_resources = [
   "java/res/drawable-xxxhdpi/ic_ad_free_videos.png",
   "java/res/drawable-xxxhdpi/ic_brave_onboarding.png",
   "java/res/drawable-xxxhdpi/ic_chrome.png",
-  "java/res/drawable-xxxhdpi/ic_cross_modal.png",
   "java/res/drawable-xxxhdpi/ic_delete_white_24dp.png",
   "java/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png",
   "java/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png",
@@ -886,7 +881,6 @@ brave_java_resources = [
   "java/res/layout/fragment_create_account.xml",
   "java/res/layout/fragment_create_custom_filters.xml",
   "java/res/layout/fragment_creating_wallet.xml",
-  "java/res/layout/fragment_cross_promotional_modal_dialog.xml",
   "java/res/layout/fragment_dapps_message.xml",
   "java/res/layout/fragment_dormant_users_engagement_dialog.xml",
   "java/res/layout/fragment_encryption_key.xml",

android/brave_java_sources.gni

@@ -41,7 +41,6 @@ brave_java_sources = [
   "../../brave/android/java/org/chromium/chrome/browser/BraveSwipeRefreshHandler.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveSyncWorker.java",
   "../../brave/android/java/org/chromium/chrome/browser/BraveWalletProvider.java",
-  "../../brave/android/java/org/chromium/chrome/browser/CrossPromotionalModalDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/DormantUsersEngagementDialogFragment.java",
   "../../brave/android/java/org/chromium/chrome/browser/InternetConnection.java",
   "../../brave/android/java/org/chromium/chrome/browser/OpenYtInBraveDialogFragment.java",

android/java/org/chromium/chrome/browser/app/BraveActivity.java

@@ -100,7 +100,6 @@
 import org.chromium.chrome.browser.BraveRewardsHelper;
 import org.chromium.chrome.browser.BraveSyncWorker;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
-import org.chromium.chrome.browser.CrossPromotionalModalDialogFragment;
 import org.chromium.chrome.browser.DormantUsersEngagementDialogFragment;
 import org.chromium.chrome.browser.IntentHandler;
 import org.chromium.chrome.browser.InternetConnection;
@@ -282,7 +281,6 @@ public abstract class BraveActivity extends ChromeActivity
 
     private static final int DAYS_4 = 4;
     private static final int DAYS_7 = 7;
-    private static final int DAYS_12 = 12;
 
     private static final int MONTH_1 = 1;
 
@@ -1143,19 +1141,6 @@ public void finishNativeInitialization() {
         //     OnboardingPrefManager.getInstance().setOnboardingShownForSkip(true);
         // }
 
-        if (ChromeSharedPreferences.getInstance().readInt(BravePreferenceKeys.BRAVE_APP_OPEN_COUNT)
-                == 1) {
-            Calendar calender = Calendar.getInstance();
-            calender.setTime(new Date());
-            calender.add(Calendar.DATE, DAYS_12);
-            OnboardingPrefManager.getInstance().setNextCrossPromoModalDate(
-                    calender.getTimeInMillis());
-        }
-
-        if (OnboardingPrefManager.getInstance().showCrossPromoModal()) {
-            showCrossPromotionalDialog();
-            OnboardingPrefManager.getInstance().setCrossPromoModalShown(true);
-        }
         BraveSyncAccountDeletedInformer.show();
 
         if (!OnboardingPrefManager.getInstance().isOneTimeNotificationStarted() && isFirstInstall) {
@@ -2066,13 +2051,6 @@ private void showBraveRateDialog() {
         rateDialogFragment.show(getSupportFragmentManager(), BraveRateDialogFragment.TAG_FRAGMENT);
     }
 
-    private void showCrossPromotionalDialog() {
-        CrossPromotionalModalDialogFragment mCrossPromotionalModalDialogFragment =
-                new CrossPromotionalModalDialogFragment();
-        mCrossPromotionalModalDialogFragment.show(
-                getSupportFragmentManager(), "CrossPromotionalModalDialogFragment");
-    }
-
     private void openYtInBraveDialog() {
         OpenYtInBraveDialogFragment mOpenYtInBraveDialogFragment =
                 new OpenYtInBraveDialogFragment();

android/java/org/chromium/chrome/browser/onboarding/OnboardingPrefManager.java

@@ -33,9 +33,7 @@ public class OnboardingPrefManager {
 
     private static final String PREF_ONBOARDING = "onboarding";
     private static final String PREF_P3A_ONBOARDING = "p3a_onboarding";
-    private static final String PREF_CROSS_PROMO_MODAL = "cross_promo_modal";
     private static final String PREF_ONBOARDING_V2 = "onboarding_v2";
-    private static final String PREF_NEXT_CROSS_PROMO_MODAL_DATE = "next_cross_promo_modal_date";
     private static final String PREF_SEARCH_ENGINE_ONBOARDING = "search_engine_onboarding";
     public static final String PREF_BRAVE_STATS = "brave_stats";
     public static final String PREF_BRAVE_STATS_NOTIFICATION = "brave_stats_notification";
@@ -237,33 +235,6 @@ public void onboardingNotification() {
         }
     }
 
-    private long getNextCrossPromoModalDate() {
-        return mSharedPreferences.getLong(PREF_NEXT_CROSS_PROMO_MODAL_DATE, 0);
-    }
-
-    public void setNextCrossPromoModalDate(long nextDate) {
-        SharedPreferences.Editor sharedPreferencesEditor = mSharedPreferences.edit();
-        sharedPreferencesEditor.putLong(PREF_NEXT_CROSS_PROMO_MODAL_DATE, nextDate);
-        sharedPreferencesEditor.apply();
-    }
-
-    public void setCrossPromoModalShown(boolean isShown) {
-        SharedPreferences.Editor sharedPreferencesEditor = mSharedPreferences.edit();
-        sharedPreferencesEditor.putBoolean(PREF_CROSS_PROMO_MODAL, isShown);
-        sharedPreferencesEditor.apply();
-    }
-
-    private boolean hasCrossPromoModalShown() {
-        return mSharedPreferences.getBoolean(PREF_CROSS_PROMO_MODAL, false);
-    }
-
-    public boolean showCrossPromoModal() {
-        boolean shouldShow = !hasCrossPromoModalShown()
-                             && (getNextCrossPromoModalDate() > 0
-                                 && System.currentTimeMillis() > getNextCrossPromoModalDate());
-        return shouldShow;
-    }
-
     public static Map<String, SearchEngineEnum> searchEngineMap =
             Map.ofEntries(
                     Map.entry(GOOGLE, SearchEngineEnum.GOOGLE),

browser/ui/android/strings/android_brave_strings.grd

@@ -1708,12 +1708,6 @@ Are you sure you want to do this?
       <message name="IDS_NO_THANK_YOU" desc="Open youtube in brave modal negative action text">
         No, thank you
       </message>
-      <message name="IDS_BRAVE_WORKS_EVERYWHERE" desc="Cross promotional modal title text">
-        Brave works everywhere
-      </message>
-      <message name="IDS_DOWNLOAD_BRAVE" desc="Cross promotional modal text">
-        Download Brave at brave.com on your laptop or tablet for a faster and more private web
-      </message>
       <message name="IDS_PRIVACY_PROTECTION" desc="Title for onboading bottomsheet.">
         Privacy protection
       </message>