From 224c227ee047db1e3fcbe2be2b14f9f301f15743 Mon Sep 17 00:00:00 2001 From: Carmelo Messina Date: Thu, 11 Dec 2025 14:37:06 +0100 Subject: [PATCH] Restore Simplified NTP launch: fix dangling raw_ptr on destruction --- .../patches/Restore-Simplified-NTP-launch.patch | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index de6629c1..bf6d5a2b 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -40,6 +40,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../engagement/important_sites_util.cc | 2 +- .../flags/android/chrome_feature_list.cc | 1 + .../browser/flags/ChromeFeatureList.java | 3 +- + .../chrome_most_visited_sites_factory.cc | 3 - .../client_util/HomeModulesRankingHelper.java | 1 + .../strings/android_chrome_strings.grd | 6 + .../core/browser/top_sites_constants.h | 2 +- @@ -49,7 +50,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../Restore-Simplified-NTP-launch.inc | 12 + .../Restore-Simplified-NTP-launch.inc | 10 + .../Restore-Simplified-NTP-launch.inc | 1 + - 43 files changed, 648 insertions(+), 61 deletions(-) + 44 files changed, 648 insertions(+), 64 deletions(-) create mode 100644 chrome/android/java/res/drawable-hdpi/ic_most_visited_placeholder.png create mode 100644 chrome/android/java/res/drawable-mdpi/ic_most_visited_placeholder.png create mode 100644 chrome/android/java/res/drawable-xhdpi/ic_most_visited_placeholder.png @@ -1544,6 +1545,19 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final CachedFlag sMaliciousApkDownloadCheck = newCachedFlag( MALICIOUS_APK_DOWNLOAD_CHECK, +diff --git a/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc b/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc +--- a/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc ++++ b/chrome/browser/ntp_tiles/chrome_most_visited_sites_factory.cc +@@ -77,9 +77,6 @@ ChromeMostVisitedSitesFactory::NewForProfile(Profile* profile) { + } + + std::unique_ptr data_decoder; +-#if BUILDFLAG(IS_ANDROID) +- data_decoder = std::make_unique(); +-#endif + + bool is_default_chrome_app_migrated; + #if BUILDFLAG(IS_ANDROID) diff --git a/chrome/browser/segmentation_platform/android/java/src/org/chromium/chrome/browser/segmentation_platform/client_util/HomeModulesRankingHelper.java b/chrome/browser/segmentation_platform/android/java/src/org/chromium/chrome/browser/segmentation_platform/client_util/HomeModulesRankingHelper.java --- a/chrome/browser/segmentation_platform/android/java/src/org/chromium/chrome/browser/segmentation_platform/client_util/HomeModulesRankingHelper.java +++ b/chrome/browser/segmentation_platform/android/java/src/org/chromium/chrome/browser/segmentation_platform/client_util/HomeModulesRankingHelper.java