diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index 9474d3c0..d6ac1ddb 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -21,8 +21,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html .../flags/android/chrome_feature_list.cc | 5 ++ .../flags/android/chrome_feature_list.h | 1 + .../browser/flags/ChromeFeatureList.java | 1 + + .../signin/public/base/signin_switches.cc | 2 +- .../variations/fieldtrial_testing_config.json | 18 +++++ - 16 files changed, 194 insertions(+), 4 deletions(-) + 17 files changed, 195 insertions(+), 5 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 @@ -397,6 +398,18 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f public static final String MESSAGES_FOR_ANDROID_INFRASTRUCTURE = "MessagesForAndroidInfrastructure"; public static final String MESSAGES_FOR_ANDROID_PERMISSION_UPDATE = +diff --git a/components/signin/public/base/signin_switches.cc b/components/signin/public/base/signin_switches.cc +--- a/components/signin/public/base/signin_switches.cc ++++ b/components/signin/public/base/signin_switches.cc +@@ -13,7 +13,7 @@ namespace switches { + // Feature to add a signed-out avatar on the NTP. + BASE_FEATURE(kIdentityStatusConsistency, + "IdentityStatusConsistency", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ base::FEATURE_DISABLED_BY_DEFAULT); + #endif + + // Clears the token service before using it. This allows simulating the diff --git a/testing/variations/fieldtrial_testing_config.json b/testing/variations/fieldtrial_testing_config.json --- a/testing/variations/fieldtrial_testing_config.json +++ b/testing/variations/fieldtrial_testing_config.json