From ba293ac0dc62ff00ceadecacf69f33c8cc424680 Mon Sep 17 00:00:00 2001 From: csagan5 <32685696+csagan5@users.noreply.github.com> Date: Wed, 20 Oct 2021 01:34:25 +0200 Subject: [PATCH] Updated patches for v94 --- .../Add-IsCleartextPermitted-flag.patch | 2 +- ...-allow-screenshots-in-Incognito-mode.patch | 14 ++-- .../Add-bookmark-import-export-actions.patch | 6 +- ...g-for-omnibox-autocomplete-filtering.patch | 2 +- .../Add-flag-for-save-data-header.patch | 2 +- .../Add-flag-to-disable-vibration.patch | 6 +- .../Automated-domain-substitution.patch | 8 +- build/patches/Bromite-auto-updater.patch | 2 +- build/patches/Disable-safe-browsing.patch | 77 +++++++++++++------ .../Disable-text-fragments-by-default.patch | 2 +- build/patches/Enable-share-intent.patch | 2 +- .../Restore-Simplified-NTP-launch.patch | 2 +- ...vert-flags-remove-num-raster-threads.patch | 2 +- 13 files changed, 77 insertions(+), 50 deletions(-) diff --git a/build/patches/Add-IsCleartextPermitted-flag.patch b/build/patches/Add-IsCleartextPermitted-flag.patch index a54941bb..dbe6f3a3 100644 --- a/build/patches/Add-IsCleartextPermitted-flag.patch +++ b/build/patches/Add-IsCleartextPermitted-flag.patch @@ -14,7 +14,7 @@ Subject: Add IsCleartextPermitted flag diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7612,6 +7612,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7617,6 +7617,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( chrome::android::kBookmarksExportUseSaf)}, diff --git a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch index 88e4bc2f..8a669003 100644 --- a/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch +++ b/build/patches/Add-a-flag-to-allow-screenshots-in-Incognito-mode.patch @@ -17,19 +17,19 @@ See also: diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3156,6 +3156,12 @@ const FeatureEntry kFeatureEntries[] = { - flag_descriptions::kDeprecateLowUsageCodecsName, - flag_descriptions::kDeprecateLowUsageCodecsDescription, kOsCrOS | kOsLinux, - FEATURE_VALUE_TYPE(media::kDeprecateLowUsageCodecs)}, +@@ -7518,6 +7518,12 @@ const FeatureEntry kFeatureEntries[] = { + "AndroidDynamicColor")}, + #endif // defined(OS_ANDROID) + +#if defined(OS_ANDROID) + {switches::kEnableIncognitoSnapshotsInAndroidRecents, flag_descriptions::kEnableIncognitoSnapshotsInAndroidRecentsName, + flag_descriptions::kEnableIncognitoSnapshotsInAndroidRecentsDescription, kOsAndroid, + SINGLE_VALUE_TYPE(switches::kEnableIncognitoSnapshotsInAndroidRecents)}, +#endif + - #endif // defined(OS_CHROMEOS) - - #if defined(OS_LINUX) + #if defined(OS_WIN) + {"win-10-tab-search-caption-button", + flag_descriptions::kWin10TabSearchCaptionButtonName, diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc diff --git a/build/patches/Add-bookmark-import-export-actions.patch b/build/patches/Add-bookmark-import-export-actions.patch index 498380a9..df152c69 100644 --- a/build/patches/Add-bookmark-import-export-actions.patch +++ b/build/patches/Add-bookmark-import-export-actions.patch @@ -821,7 +821,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -7562,6 +7562,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7567,6 +7567,12 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE( password_manager::features::kPasswordsAccountStorageRevisedOptInFlow)}, @@ -1339,7 +1339,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -5302,6 +5302,11 @@ const char kWebKioskEnableLacrosDescription[] = +@@ -5306,6 +5306,11 @@ const char kWebKioskEnableLacrosDescription[] = "Chrome OS. When disabled, the Ash-chrome will be used"; #endif // BUILDFLAG(IS_CHROMEOS_ASH) @@ -1354,7 +1354,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -3088,6 +3088,9 @@ extern const char kWebKioskEnableLacrosName[]; +@@ -3091,6 +3091,9 @@ extern const char kWebKioskEnableLacrosName[]; extern const char kWebKioskEnableLacrosDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch index b1b2f558..f7f93277 100644 --- a/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch +++ b/build/patches/Add-flag-for-omnibox-autocomplete-filtering.patch @@ -38,7 +38,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if defined(OS_ANDROID) const FeatureEntry::FeatureParam kAdaptiveButton_AlwaysNone[] = { {"mode", "always-none"}}; -@@ -4772,6 +4788,11 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4766,6 +4782,11 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(chrome::android::kReaderModeInCCT)}, #endif // !defined(OS_ANDROID) diff --git a/build/patches/Add-flag-for-save-data-header.patch b/build/patches/Add-flag-for-save-data-header.patch index 3ed87a43..11eb4405 100644 --- a/build/patches/Add-flag-for-save-data-header.patch +++ b/build/patches/Add-flag-for-save-data-header.patch @@ -14,7 +14,7 @@ Subject: Add flag for save-data-header diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -4506,6 +4506,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4500,6 +4500,9 @@ const FeatureEntry kFeatureEntries[] = { #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if defined(OS_ANDROID) diff --git a/build/patches/Add-flag-to-disable-vibration.patch b/build/patches/Add-flag-to-disable-vibration.patch index c51567d8..c78e4ac7 100644 --- a/build/patches/Add-flag-to-disable-vibration.patch +++ b/build/patches/Add-flag-to-disable-vibration.patch @@ -18,7 +18,7 @@ Subject: Add flag to disable vibration diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -6208,6 +6208,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6207,6 +6207,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kNewMacNotificationAPI)}, #endif @@ -32,7 +32,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -5123,6 +5123,9 @@ const char kDefaultMeetWebAppDescription[] = +@@ -5127,6 +5127,9 @@ const char kDefaultMeetWebAppDescription[] = "Enables the Meet web app to be installed by default."; #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) @@ -45,7 +45,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2965,6 +2965,9 @@ extern const char kDefaultMeetWebAppName[]; +@@ -2968,6 +2968,9 @@ extern const char kDefaultMeetWebAppName[]; extern const char kDefaultMeetWebAppDescription[]; #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/build/patches/Automated-domain-substitution.patch b/build/patches/Automated-domain-substitution.patch index b6a2a085..69a5d3b0 100644 --- a/build/patches/Automated-domain-substitution.patch +++ b/build/patches/Automated-domain-substitution.patch @@ -4258,7 +4258,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kLiteVideoDefaultDownlinkBandwidthKbps[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -3718,7 +3718,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3712,7 +3712,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSyncSandboxDescription, kOsAll, SINGLE_VALUE_TYPE_AND_VALUE( switches::kSyncServiceURL, @@ -4267,7 +4267,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc #if !defined(OS_ANDROID) {"media-router-cast-allow-all-ips", flag_descriptions::kMediaRouterCastAllowAllIPsName, -@@ -3926,7 +3926,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3920,7 +3920,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSetMarketUrlForTestingName, flag_descriptions::kSetMarketUrlForTestingDescription, kOsAndroid, SINGLE_VALUE_TYPE_AND_VALUE(switches::kMarketUrlForTesting, @@ -5470,7 +5470,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kDisableProcessReuse[] = "Disable subframe process reuse"; const char kDisableProcessReuseDescription[] = -@@ -2175,7 +2175,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; +@@ -2181,7 +2181,7 @@ const char kReduceUserAgentName[] = "Reduce User-Agent request header"; const char kReduceUserAgentDescription[] = "Reduce (formerly, \"freeze\") the amount of information available in " "the User-Agent request header. " @@ -5479,7 +5479,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti const char kRestrictGamepadAccessName[] = "Restrict gamepad access"; const char kRestrictGamepadAccessDescription[] = -@@ -2192,7 +2192,7 @@ const char kIntensiveWakeUpThrottlingName[] = +@@ -2198,7 +2198,7 @@ const char kIntensiveWakeUpThrottlingName[] = const char kIntensiveWakeUpThrottlingDescription[] = "When enabled, wake ups from DOM Timers are limited to 1 per minute in a " "page that has been hidden for 5 minutes. For additional details, see " diff --git a/build/patches/Bromite-auto-updater.patch b/build/patches/Bromite-auto-updater.patch index 0ccd2189..5ae0f072 100644 --- a/build/patches/Bromite-auto-updater.patch +++ b/build/patches/Bromite-auto-updater.patch @@ -910,7 +910,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro + Allow checking for updates + + -+ Check for updates by contacting the Bromite repo ++ Notify about new releases by periodically checking for their availability + diff --git a/build/patches/Disable-safe-browsing.patch b/build/patches/Disable-safe-browsing.patch index 8bc82a45..7089d3bd 100644 --- a/build/patches/Disable-safe-browsing.patch +++ b/build/patches/Disable-safe-browsing.patch @@ -31,6 +31,7 @@ Disable CrowdDeny feature .../browser/download/download_item_model.cc | 15 +++- chrome/browser/download/download_item_model.h | 4 ++ chrome/browser/download/download_prefs.cc | 17 ++--- + chrome/browser/download/download_stats.cc | 4 ++ .../download/download_target_determiner.cc | 46 ++++++------ .../download/download_target_determiner.h | 6 ++ .../browser/download/download_target_info.cc | 4 ++ @@ -52,7 +53,7 @@ Disable CrowdDeny feature ...hrome_browser_main_extra_parts_profiles.cc | 2 - chrome/browser/profiles/profile_impl.cc | 4 +- chrome/browser/safe_browsing/BUILD.gn | 4 +- - chrome/browser/safe_browsing/android/BUILD.gn | 8 --- + chrome/browser/safe_browsing/android/BUILD.gn | 4 -- .../safe_browsing/SafeBrowsingBridge.java | 71 ------------------- .../android/safe_browsing_bridge.cc | 51 ------------- .../download_protection_service.cc | 5 -- @@ -78,7 +79,7 @@ Disable CrowdDeny feature .../file_system_access_file_writer_impl.cc | 41 +---------- .../file_system_access_file_writer_impl.h | 9 +-- .../file_system_access_permission_context.h | 6 -- - 72 files changed, 169 insertions(+), 660 deletions(-) + 73 files changed, 173 insertions(+), 656 deletions(-) diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml --- a/chrome/android/java/res/xml/google_services_preferences.xml @@ -823,11 +824,12 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/common/buildflags.h" -@@ -70,7 +72,9 @@ +@@ -69,8 +71,10 @@ + #include "components/prefs/pref_member.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/buildflags.h" - #include "components/safe_browsing/content/browser/download/download_stats.h" +#if defined(FULL_SAFE_BROWSING) + #include "components/safe_browsing/content/browser/download/download_stats.h" #include "components/safe_browsing/content/common/file_type_policies.h" +#endif #include "components/services/quarantine/public/mojom/quarantine.mojom.h" @@ -1165,14 +1167,40 @@ diff --git a/chrome/browser/download/download_prefs.cc b/chrome/browser/download DCHECK(extension[0] == base::FilePath::kExtensionSeparator); extension.erase(0, 1); +diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download/download_stats.cc +--- a/chrome/browser/download/download_stats.cc ++++ b/chrome/browser/download/download_stats.cc +@@ -4,7 +4,9 @@ + + #include "chrome/browser/download/download_stats.h" + #include "components/profile_metrics/browser_profile_type.h" ++#if defined(FULL_SAFE_BROWSING) + #include "components/safe_browsing/content/browser/download/download_stats.h" ++#endif + + #include "base/metrics/histogram_functions.h" + #include "base/metrics/user_metrics.h" +@@ -26,8 +28,10 @@ void RecordDangerousDownloadWarningShown( + bool has_user_gesture) { + base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type, + download::DOWNLOAD_DANGER_TYPE_MAX); ++#if defined(FULL_SAFE_BROWSING) + safe_browsing::RecordDangerousDownloadWarningShown( + danger_type, file_path, is_https, has_user_gesture); ++#endif + } + + void RecordOpenedDangerousConfirmDialog( diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -31,7 +31,9 @@ +@@ -29,9 +29,11 @@ + #include "components/download/public/common/download_interrupt_reasons.h" + #include "components/history/core/browser/history_service.h" #include "components/prefs/pref_service.h" ++#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/browser/download/download_stats.h" #include "components/safe_browsing/content/browser/safe_browsing_metrics_collector.h" -+#if defined(FULL_SAFE_BROWSING) #include "components/safe_browsing/content/common/file_type_policies.h" +#endif #include "content/public/browser/browser_context.h" @@ -1245,13 +1273,15 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow return CONTINUE; } -@@ -882,11 +894,13 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( - virtual_path_.BaseName()), - download_->HasUserGesture(), visited_referrer_before, - GetLastDownloadBypassTimestamp()); +@@ -877,6 +889,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( + bool visited_referrer_before) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK_EQ(STATE_DETERMINE_INTERMEDIATE_PATH, next_state_); +#if defined(FULL_SAFE_BROWSING) - danger_level_ = GetDangerLevel( - visited_referrer_before ? VISITED_REFERRER : NO_VISITS_TO_REFERRER); + safe_browsing::RecordDownloadFileTypeAttributes( + safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( + virtual_path_.BaseName()), +@@ -887,6 +900,7 @@ void DownloadTargetDeterminer::CheckVisitedReferrerBeforeDone( if (danger_level_ != DownloadFileType::NOT_DANGEROUS && danger_type_ == download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS) danger_type_ = download::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE; @@ -1287,7 +1317,7 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( PriorVisitsToReferrer visits) const { DCHECK_CURRENTLY_ON(BrowserThread::UI); -@@ -1111,30 +1130,9 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1111,29 +1130,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( download_->HasUserGesture()) return DownloadFileType::NOT_DANGEROUS; @@ -1316,10 +1346,16 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/brow - return danger_level; + return DownloadFileType::NOT_DANGEROUS; } -+#endif absl::optional - DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { +@@ -1147,6 +1144,7 @@ DownloadTargetDeterminer::GetLastDownloadBypassTimestamp() const { + EventType::DANGEROUS_DOWNLOAD_BYPASS) + : absl::nullopt; + } ++#endif + + void DownloadTargetDeterminer::OnDownloadDestroyed( + DownloadItem* download) { diff --git a/chrome/browser/download/download_target_determiner.h b/chrome/browser/download/download_target_determiner.h --- a/chrome/browser/download/download_target_determiner.h +++ b/chrome/browser/download/download_target_determiner.h @@ -1923,16 +1959,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin diff --git a/chrome/browser/safe_browsing/android/BUILD.gn b/chrome/browser/safe_browsing/android/BUILD.gn --- a/chrome/browser/safe_browsing/android/BUILD.gn +++ b/chrome/browser/safe_browsing/android/BUILD.gn -@@ -26,21 +26,13 @@ source_set("android") { - # that workarounds aren't needed. - "//content/public/browser", - ] -- -- if (safe_browsing_mode != 0) { -- deps += [ "//components/safe_browsing/content/common:file_type_policies" ] -- } - } - +@@ -35,12 +35,8 @@ source_set("android") { android_library("java") { sources = [ "java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java", diff --git a/build/patches/Disable-text-fragments-by-default.patch b/build/patches/Disable-text-fragments-by-default.patch index dc597b81..bdc58bf2 100644 --- a/build/patches/Disable-text-fragments-by-default.patch +++ b/build/patches/Disable-text-fragments-by-default.patch @@ -17,7 +17,7 @@ Revert "[Text Fragment] Unflag fragment directive removal." diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -5383,6 +5383,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5377,6 +5377,7 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kSharingHubDesktopOmniboxDescription, kOsDesktop, FEATURE_VALUE_TYPE(sharing_hub::kSharingHubDesktopOmnibox)}, #endif // defined(OS_WIN) || defined(OS_MAC) || defined(OS_LINUX) diff --git a/build/patches/Enable-share-intent.patch b/build/patches/Enable-share-intent.patch index 06b7a783..72494627 100644 --- a/build/patches/Enable-share-intent.patch +++ b/build/patches/Enable-share-intent.patch @@ -304,7 +304,7 @@ new file mode 100644 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -5408,6 +5408,10 @@ const FeatureEntry kFeatureEntries[] = { +@@ -5402,6 +5402,10 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(sharing_hub::kDesktopScreenshots)}, #endif diff --git a/build/patches/Restore-Simplified-NTP-launch.patch b/build/patches/Restore-Simplified-NTP-launch.patch index 506e79f2..92d69d0f 100644 --- a/build/patches/Restore-Simplified-NTP-launch.patch +++ b/build/patches/Restore-Simplified-NTP-launch.patch @@ -325,7 +325,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/suggestions/Sug diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3881,6 +3881,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3875,6 +3875,9 @@ const FeatureEntry kFeatureEntries[] = { SINGLE_VALUE_TYPE_AND_VALUE( switches::kForceShowUpdateMenuItemCustomSummary, "Custom Summary")}, diff --git a/build/patches/Revert-flags-remove-num-raster-threads.patch b/build/patches/Revert-flags-remove-num-raster-threads.patch index 64df8548..04aa4919 100644 --- a/build/patches/Revert-flags-remove-num-raster-threads.patch +++ b/build/patches/Revert-flags-remove-num-raster-threads.patch @@ -29,7 +29,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, {flag_descriptions::kTouchSelectionStrategyCharacter, -@@ -3542,6 +3551,9 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3536,6 +3545,9 @@ const FeatureEntry kFeatureEntries[] = { {"enable-use-zoom-for-dsf", flag_descriptions::kEnableUseZoomForDsfName, flag_descriptions::kEnableUseZoomForDsfDescription, kOsAll, MULTI_VALUE_TYPE(kEnableUseZoomForDSFChoices)},