Restore Simplified NTP launch: fix crash with MagicStackAndroid enabled (#1814)
This commit is contained in:
@@ -28,11 +28,12 @@ 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 +-
|
||||
.../client_util/HomeModulesRankingHelper.java | 1 +
|
||||
.../history/core/browser/top_sites_impl.h | 2 +-
|
||||
.../Restore-Simplified-NTP-launch.inc | 12 ++
|
||||
.../Restore-Simplified-NTP-launch.inc | 5 +
|
||||
.../Restore-Simplified-NTP-launch.inc | 1 +
|
||||
26 files changed, 398 insertions(+), 31 deletions(-)
|
||||
27 files changed, 399 insertions(+), 31 deletions(-)
|
||||
create mode 100644 chrome/android/java/res/layout/ntp_shortcuts.xml
|
||||
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/feedback/SimplifiedNtpFeedbackSource.java
|
||||
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesGridLayout.java
|
||||
@@ -765,6 +766,17 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
|
||||
public static final CachedFlag sMayLaunchurlUsesSeparateStoragePartition = newCachedFlag(MAYLAUNCHURL_USES_SEPARATE_STORAGE_PARTITION, false);
|
||||
public static final CachedFlag sMostVisitedTilesReselect =
|
||||
newCachedFlag(MOST_VISITED_TILES_RESELECT, false);
|
||||
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
|
||||
@@ -32,6 +32,7 @@ public final class HomeModulesRankingHelper {
|
||||
@NonNull Profile profile,
|
||||
@NonNull InputContext freshnessAndEphemeralInputs,
|
||||
@NonNull Callback<List<String>> callback) {
|
||||
+ if ((true)) return;
|
||||
HomeModulesRankingHelperJni.get()
|
||||
.getClassificationResult(
|
||||
profile,
|
||||
diff --git a/components/history/core/browser/top_sites_impl.h b/components/history/core/browser/top_sites_impl.h
|
||||
--- a/components/history/core/browser/top_sites_impl.h
|
||||
+++ b/components/history/core/browser/top_sites_impl.h
|
||||
|
||||
Reference in New Issue
Block a user