diff --git a/build/bromite_patches_list.txt b/build/bromite_patches_list.txt index e39821a5..a57d9484 100644 --- a/build/bromite_patches_list.txt +++ b/build/bromite_patches_list.txt @@ -201,55 +201,14 @@ Enable-third-party-storage-partitioning.patch Restore-adaptive-button-in-top-toolbar-customization.patch Add-kill-switch-for-unsupported-clangd-flags.patch -00OpenSearch--miscellaneous--fixup-.patch -00Eyeo-Adblock.patch -00Eyeo-Adblock-Remove-Privacy-Issues.patch -00Add-an-always-incognito-mode--win-fixup-.patch -00Experimental-user-scripts-support--win-fixup-.patch -00Disable-safe-browsing--win-fixup-.patch -00ungoogled-chr--Disable-profile-avatar--win-fixup-.patch -00Add-a-proxy-configuration-page--win-fixup-.patch -00Add-bookmark-import-export-actions--win-fixup-.patch -00openH264--enable-ARM-ARM64-optimizati--win-fixup-.patch -00Add-flag-to-disable-IPv6-probes--win-fixup-.patch -00Remove-EV-certificates--win-fixup-.patch -00AImageReader-CFI-crash-mitigations--win-fixup-.patch -00Remove-binary-blob-integrations--win-fixup-.patch -00Enable-native-Android-autofill--win-fixup-.patch -00Remove-signin-and-sync-integrations--win-fixup-.patch -00Add-lifetime-options-for-permissions--win-fixup-.patch -00Disable-various-metrics--win-fixup-.patch -00Do-not-build-API-keys-infobar--win-fixup-.patch -00Revert-flags--remove-num-raster-thre--win-fixup-.patch -00Add-flag-to-configure-maximum-connecti--win-fixup-.patch -00Add-flag-to-disable-external-intent-re--win-fixup-.patch -00Restore-Search-Ready-Omnibox-flag--win-fixup-.patch -00Disable-requests-for-single-word-Omni--win-fixup-.patch -00Revert-the-removal-to-block-autoplay--win-fixup-.patch -00JIT-site-settings--win-fixup-.patch -00Timezone-customization--win-fixup-.patch -00Add-webGL-site-setting--win-fixup-.patch -00Add-webRTC-site-settings--win-fixup-.patch -00Eyeo-Adblock--win-fixup-.patch -00Content-settings-infrastructure--win-fixup-.patch -00ungoogled-chromium--no-special-hosts-d--win-fixup-.patch -00Logcat-crash-reports-UI--win-fixup-.patch -00Fix-windows-build.patch -00ungoogled-chr-no-special-hosts-domains--add-fixup-.patch -00Disable-fetching-of-all-field-trials--add-fixup-.patch -AudioBuffer-AnalyserNode-fp-mitigations.patch -00Disable-Component-Updates.patch -00wip-add-browser-policy.patch -00temporary-fix-libaom-build-error.patch -00Guard-for-user-agent-reduction--add-fixup-.patch -00Client-hints-overrides--add-fixup-.patch -00Add-AllowUserCertificates-flag--win-fixup-.patch -00Viewport-Protection-flag.patch -00Viewport-Protection-Site-Setting.patch -00Temp-Disable-kAutomaticLazyFrameLoadingToEmbeds.patch -00Move-navigation-bar-to-bottom--add-fixup-.patch -00Always-open-browser-controls-in-new-tab.patch -00Remove-HTTP-referrals-in-cross-origin-navi--fixup-.patch -00win-enable-pdf-plugin.patch -00win-disable-annotate-downloads.patch -00win-enable-HighEfficiencyMode-by-default.patch \ No newline at end of file +00Remove-binary-blob-integrations--add-fixup-.patch +00Remove-signin-and-sync-integrations--add-fixup-.patch +00Remove-price-shopping-commerce-integra--add-fixup-.patch +00User-agent-customization--add-fixup-.patch +00Disable-conversion-measurement-api--add-fixup-.patch +00Disable-safe-browsing--add-fixup-.patch +00Disable-all-predictors-code--add-fixup-.patch +00Timezone-customization--add-fixup-.patch +00Add-webGL-site-setting--add-fixup-.patch +00Add-webRTC-site-settings--add-fixup-.patch +00Add-a-proxy-configuration-page--add-fixup-.patch \ No newline at end of file diff --git a/build/patches/00Add-a-proxy-configuration-page--add-fixup-.patch b/build/patches/00Add-a-proxy-configuration-page--add-fixup-.patch new file mode 100644 index 00000000..f8b1ae46 --- /dev/null +++ b/build/patches/00Add-a-proxy-configuration-page--add-fixup-.patch @@ -0,0 +1,53 @@ +From: Your Name +Date: Thu, 5 Jan 2023 11:48:07 +0000 +Subject: Add a proxy configuration page (add fixup) + +--- + chrome/browser/resources/proxy_config.js | 13 ++++++++++++- + chrome/browser/ui/webui/proxy_config_ui.cc | 2 +- + 2 files changed, 13 insertions(+), 2 deletions(-) + +diff --git a/chrome/browser/resources/proxy_config.js b/chrome/browser/resources/proxy_config.js +--- a/chrome/browser/resources/proxy_config.js ++++ b/chrome/browser/resources/proxy_config.js +@@ -16,7 +16,6 @@ + */ + + import {$} from 'chrome://resources/js/util.js'; +-import {addSingletonGetter} from 'chrome://resources/js/cr.m.js'; + + /** + * Main entry point called once the page has loaded. +@@ -60,6 +59,18 @@ var ProxyConfigView = (function() { + var kIdFtpProxies = 'ftp-proxies'; + var kIdFallbackProxies = 'fallback-proxies'; + ++ /** ++ * Adds a {@code getInstance} static method that always return the same ++ * instance object. ++ * @param {!Function} ctor The constructor for the class to add the static ++ * method to. ++ */ ++ function addSingletonGetter(ctor) { ++ ctor.getInstance = function() { ++ return ctor.instance_ || (ctor.instance_ = new ctor()); ++ }; ++ } ++ + /** + * @constructor + */ +diff --git a/chrome/browser/ui/webui/proxy_config_ui.cc b/chrome/browser/ui/webui/proxy_config_ui.cc +--- a/chrome/browser/ui/webui/proxy_config_ui.cc ++++ b/chrome/browser/ui/webui/proxy_config_ui.cc +@@ -164,7 +164,7 @@ void ProxyConfigMessageHandler::OnProxyConfigChanged( + + // call Javascript function + web_ui()->CallJavascriptFunctionUnsafe("ProxyConfigView.getInstance().onProxyConfigChanged", +- *state.CreateDeepCopy()); ++ state.Clone()); + } + + const std::string omitDirect(const std::string pacString) { +-- +2.25.1 diff --git a/build/patches/00Add-webGL-site-setting--add-fixup-.patch b/build/patches/00Add-webGL-site-setting--add-fixup-.patch new file mode 100644 index 00000000..f251feeb --- /dev/null +++ b/build/patches/00Add-webGL-site-setting--add-fixup-.patch @@ -0,0 +1,26 @@ +From: Your Name +Date: Thu, 5 Jan 2023 11:37:12 +0000 +Subject: Add webGL site setting (add fixup) + +--- + .../core/browser/content_settings_registry.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc +--- a/components/content_settings/core/browser/content_settings_registry.cc ++++ b/components/content_settings/core/browser/content_settings_registry.cc +@@ -636,9 +636,9 @@ void ContentSettingsRegistry::Init() { + + Register(ContentSettingsType::WEBGL, "webgl", CONTENT_SETTING_BLOCK, + WebsiteSettingsInfo::SYNCABLE, +- AllowlistedSchemes(), +- ValidSettings(CONTENT_SETTING_ALLOW, +- CONTENT_SETTING_BLOCK), ++ /*allowlisted_schemes=*/{}, ++ /*valid_settings=*/{CONTENT_SETTING_ALLOW, ++ CONTENT_SETTING_BLOCK}, + WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, + WebsiteSettingsRegistry::PLATFORM_ANDROID, + ContentSettingsInfo::INHERIT_IN_INCOGNITO, +-- +2.25.1 diff --git a/build/patches/00Add-webRTC-site-settings--add-fixup-.patch b/build/patches/00Add-webRTC-site-settings--add-fixup-.patch new file mode 100644 index 00000000..5eaf0733 --- /dev/null +++ b/build/patches/00Add-webRTC-site-settings--add-fixup-.patch @@ -0,0 +1,26 @@ +From: Your Name +Date: Thu, 5 Jan 2023 11:37:41 +0000 +Subject: Add webRTC site settings (add fixup) + +--- + .../core/browser/content_settings_registry.cc | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc +--- a/components/content_settings/core/browser/content_settings_registry.cc ++++ b/components/content_settings/core/browser/content_settings_registry.cc +@@ -650,9 +650,9 @@ void ContentSettingsRegistry::Init() { + + Register(ContentSettingsType::WEBRTC, "webrtc", CONTENT_SETTING_BLOCK, + WebsiteSettingsInfo::SYNCABLE, +- AllowlistedSchemes(), +- ValidSettings(CONTENT_SETTING_ALLOW, +- CONTENT_SETTING_BLOCK), ++ /*allowlisted_schemes=*/{}, ++ /*valid_settings=*/{CONTENT_SETTING_ALLOW, ++ CONTENT_SETTING_BLOCK}, + WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, + WebsiteSettingsRegistry::PLATFORM_ANDROID, + ContentSettingsInfo::INHERIT_IN_INCOGNITO, +-- +2.25.1 diff --git a/build/patches/00Disable-all-predictors-code--add-fixup-.patch b/build/patches/00Disable-all-predictors-code--add-fixup-.patch new file mode 100644 index 00000000..408fda5c --- /dev/null +++ b/build/patches/00Disable-all-predictors-code--add-fixup-.patch @@ -0,0 +1,29 @@ +From: Your Name +Date: Thu, 5 Jan 2023 11:35:28 +0000 +Subject: Disable all predictors code (add fixup) + +--- + components/optimization_guide/core/BUILD.gn | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/components/optimization_guide/core/BUILD.gn b/components/optimization_guide/core/BUILD.gn +--- a/components/optimization_guide/core/BUILD.gn ++++ b/components/optimization_guide/core/BUILD.gn +@@ -77,12 +77,14 @@ static_library("model_executor") { + } + deps = [ + ":features", +- ":machine_learning", + "//base", + "//components/optimization_guide/proto:optimization_guide_proto", + "//net", + "//url", + ] ++ if (build_with_tflite_lib) { ++ deps += [ ":machine_learning", ] ++ } + } + + mojom("interfaces") { +-- +2.25.1 diff --git a/build/patches/00Disable-conversion-measurement-api--add-fixup-.patch b/build/patches/00Disable-conversion-measurement-api--add-fixup-.patch new file mode 100644 index 00000000..f87ae81e --- /dev/null +++ b/build/patches/00Disable-conversion-measurement-api--add-fixup-.patch @@ -0,0 +1,48 @@ +From: Your Name +Date: Thu, 5 Jan 2023 11:33:47 +0000 +Subject: Disable conversion measurement api (add fixup) + +--- + .../attribution_report_network_sender.cc | 8 ++++++-- + content/renderer/render_thread_impl.cc | 2 +- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/content/browser/attribution_reporting/attribution_report_network_sender.cc b/content/browser/attribution_reporting/attribution_report_network_sender.cc +--- a/content/browser/attribution_reporting/attribution_report_network_sender.cc ++++ b/content/browser/attribution_reporting/attribution_report_network_sender.cc +@@ -76,6 +76,9 @@ void AttributionReportNetworkSender::SendReport(AttributionDebugReport report) { + void AttributionReportNetworkSender::SendReport(GURL url, + base::ValueView report_body, + UrlLoaderCallback callback) { ++ // this is never called on Bromite but nothing would be sent if it were ++ if ((true)) return; ++ + auto resource_request = std::make_unique(); + resource_request->url = std::move(url); + resource_request->method = net::HttpRequestHeaders::kPostMethod; +@@ -132,8 +135,9 @@ void AttributionReportNetworkSender::SendReport(GURL url, + network::SimpleURLLoader::RETRY_ON_NAME_NOT_RESOLVED; + simple_url_loader_ptr->SetRetryOptions(/*max_retries=*/1, retry_mode); + +- // this is never called on Bromite but nothing would be sent if it were +- OnReportSent(std::move(it), report, is_debug_report, std::move(sent_callback), nullptr); ++ simple_url_loader_ptr->DownloadHeadersOnly( ++ url_loader_factory_.get(), ++ base::BindOnce(std::move(callback), std::move(it))); + } + + void AttributionReportNetworkSender::OnReportSent( +diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc +--- a/content/renderer/render_thread_impl.cc ++++ b/content/renderer/render_thread_impl.cc +@@ -1823,7 +1823,7 @@ RenderThreadImpl::GetOsSupportForAttributionReporting() { + + void RenderThreadImpl::SetOsSupportForAttributionReporting( + blink::mojom::AttributionOsSupport attribution_os_support) { +- attribution_os_support_ = attribution_os_support; ++ attribution_os_support_ = blink::mojom::AttributionOsSupport::kDisabled; + } + + } // namespace content +-- +2.25.1 diff --git a/build/patches/00Disable-safe-browsing--add-fixup-.patch b/build/patches/00Disable-safe-browsing--add-fixup-.patch new file mode 100644 index 00000000..1828907d --- /dev/null +++ b/build/patches/00Disable-safe-browsing--add-fixup-.patch @@ -0,0 +1,74 @@ +From: Your Name +Date: Thu, 5 Jan 2023 11:34:41 +0000 +Subject: Disable safe browsing (add fixup) + +--- + .../chrome_file_system_access_permission_context.cc | 4 +++- + chrome/browser/ui/android/strings/android_chrome_strings.grd | 3 +++ + chrome/browser/ui/webui/interstitials/interstitial_ui.cc | 4 ---- + 3 files changed, 6 insertions(+), 5 deletions(-) + +diff --git a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +--- a/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc ++++ b/chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc +@@ -115,6 +115,7 @@ const char kPathKey[] = "path"; + const char kPathTypeKey[] = "path-type"; + const char kTimestampKey[] = "timestamp"; + ++#if defined(FULL_SAFE_BROWSING) + void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread( + content::GlobalRenderFrameHostId frame_id, + const url::Origin& origin, +@@ -144,7 +145,6 @@ void ShowFileSystemAccessRestrictedDirectoryDialogOnUIThread( + origin, handle_type, std::move(callback), web_contents); + } + +-#if defined(FULL_SAFE_BROWSING) + void ShowFileSystemAccessDangerousFileDialogOnUIThread( + content::GlobalRenderFrameHostId frame_id, + const url::Origin& origin, +@@ -431,6 +431,7 @@ base::StringPiece GetGrantKeyFromGrantType(GrantType type) { + : kPermissionReadableKey; + } + ++#if defined(FULL_SAFE_BROWSING) + bool FileHasDangerousExtension(const url::Origin& origin, + const base::FilePath& path, + Profile* profile) { +@@ -442,6 +443,7 @@ bool FileHasDangerousExtension(const url::Origin& origin, + return danger_level == safe_browsing::DownloadFileType::DANGEROUS || + danger_level == safe_browsing::DownloadFileType::ALLOW_ON_USER_GESTURE; + } ++#endif + + } // namespace + +diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd +--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd ++++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd +@@ -467,6 +467,9 @@ CHAR_LIMIT guidelines: + + Because the preloaded pages are encrypted, Google will not learn anything about the preloaded page content. Google servers will learn which sites are privately preloaded. This information is only used to preload the pages, and is not linked to other information from your Google Account. + ++ ++ Help improve Chrome\u2019s features and performance ++ + + + +diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc ++++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +@@ -518,10 +518,6 @@ void InterstitialHTMLSource::StartDataRequest( + interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents); + } else if (path_without_query == "/blocked-interception") { + interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents); +- } else if (path_without_query == "/enterprise-block") { +- interstitial_delegate = CreateEnterpriseBlockPage(web_contents); +- } else if (path_without_query == "/enterprise-warn") { +- interstitial_delegate = CreateEnterpriseWarnPage(web_contents); + } else if (path_without_query == "/clock") { + interstitial_delegate = CreateBadClockBlockingPage(web_contents); + } else if (path_without_query == "/lookalike") { +-- +2.25.1 diff --git a/build/patches/00Remove-binary-blob-integrations--add-fixup-.patch b/build/patches/00Remove-binary-blob-integrations--add-fixup-.patch new file mode 100644 index 00000000..5d3289c8 --- /dev/null +++ b/build/patches/00Remove-binary-blob-integrations--add-fixup-.patch @@ -0,0 +1,53 @@ +From: Your Name +Date: Thu, 5 Jan 2023 11:26:25 +0000 +Subject: Remove binary blob integrations (add fixup) + +--- + chrome/android/java/AndroidManifest.xml | 2 ++ + chrome/browser/privacy/BUILD.gn | 1 + + .../browser/ui/signin/fre/SigninFirstRunMediator.java | 8 ++------ + 3 files changed, 5 insertions(+), 6 deletions(-) + +diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml +--- a/chrome/android/java/AndroidManifest.xml ++++ b/chrome/android/java/AndroidManifest.xml +@@ -751,6 +751,8 @@ by a child template that "extends" this file. + android:theme="@style/Theme.BrowserUI.Translucent.NoTitleBar" + android:excludeFromRecents="true" + android:process=":browser_restart_process"> ++ ++ + +Date: Thu, 5 Jan 2023 11:29:23 +0000 +Subject: Remove price/shopping/commerce integra (add fixup) + +--- + .../chrome/browser/app/ChromeActivity.java | 4 ---- + .../bookmarks/BookmarkItemsAdapter.java | 2 -- + .../bookmarks/BookmarkSaveFlowMediator.java | 21 ------------------- + .../commerce/core/commerce_feature_list.cc | 4 ++-- + 4 files changed, 2 insertions(+), 29 deletions(-) + +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +@@ -2395,10 +2395,6 @@ public abstract class ChromeActivity + } + + if (id == R.id.disable_price_tracking_menu_id) { +- PowerBookmarkUtils.setPriceTrackingEnabledWithSnackbars(mBookmarkModelSupplier.get(), +- mBookmarkModelSupplier.get().getUserBookmarkIdForTab(currentTab), +- /*enabled=*/false, mSnackbarManager, getResources(), (success) -> {}); +- RecordUserAction.record("MobileMenuDisablePriceTracking"); + return true; + } + +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkItemsAdapter.java +@@ -25,7 +25,6 @@ import org.chromium.chrome.browser.bookmarks.BookmarkRow.Location; + import org.chromium.chrome.browser.feature_engagement.TrackerFactory; + import org.chromium.chrome.browser.flags.ChromeFeatureList; + import org.chromium.chrome.browser.profiles.Profile; +-import org.chromium.chrome.browser.subscriptions.CommerceSubscriptionsServiceFactory; + import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; + import org.chromium.components.bookmarks.BookmarkId; + import org.chromium.components.bookmarks.BookmarkItem; +@@ -226,7 +225,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter mSubscriptionsManagerCallback; + private String mFolderName; + + /** +@@ -121,23 +117,6 @@ public class BookmarkSaveFlowMediator + } + + void handleNotificationSwitchToggle(CompoundButton view, boolean toggled) { +- if (mSubscriptionsManagerCallback == null) { +- mSubscriptionsManagerCallback = +- mCallbackController.makeCancelable((Boolean success) -> { +- setPriceTrackingToggleVisualsOnly(success && view.isChecked()); +- setPriceTrackingNotificationUiEnabled(success); +- }); +- } +- +- // Make sure the notification channel is initialized when the user tracks a product. +- // TODO(crbug.com/1382191): Add a SubscriptionsObserver in the PriceDropNotificationManager +- // and initialize the channel there. +- if (toggled && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { +- PriceDropNotificationManagerFactory.create().createNotificationChannel(); +- } +- setPriceTrackingIconForEnabledState(toggled); +- PriceTrackingUtils.setPriceTrackingStateForBookmark(Profile.getLastUsedRegularProfile(), +- mBookmarkId.getId(), toggled, mSubscriptionsManagerCallback); + } + + void setPriceTrackingNotificationUiEnabled(boolean enabled) { +diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc +--- a/components/commerce/core/commerce_feature_list.cc ++++ b/components/commerce/core/commerce_feature_list.cc +@@ -98,8 +98,8 @@ BASE_FEATURE(kCommerceMerchantViewer, + base::FEATURE_DISABLED_BY_DEFAULT); + + BASE_FEATURE(kCommercePriceTracking, +- "CommercePriceTracking", +- base::FEATURE_DISABLED_BY_DEFAULT); ++ "CommercePriceTracking", // guard this ++ base::FEATURE_DISABLED_BY_DEFAULT); // guard this + + const base::FeatureParam kDeleteAllMerchantsOnClearBrowsingHistory{ + &kCommerceMerchantViewer, "delete_all_merchants_on_clear_history", false}; +-- +2.25.1 diff --git a/build/patches/00Remove-signin-and-sync-integrations--add-fixup-.patch b/build/patches/00Remove-signin-and-sync-integrations--add-fixup-.patch new file mode 100644 index 00000000..28357065 --- /dev/null +++ b/build/patches/00Remove-signin-and-sync-integrations--add-fixup-.patch @@ -0,0 +1,42 @@ +From: Your Name +Date: Thu, 5 Jan 2023 11:27:59 +0000 +Subject: Remove signin and sync integrations (add fixup) + +--- + chrome/android/BUILD.gn | 1 + + .../chrome/browser/app/feed/FeedActionDelegateImpl.java | 3 --- + 2 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn +--- a/chrome/android/BUILD.gn ++++ b/chrome/android/BUILD.gn +@@ -276,6 +276,7 @@ if (current_toolchain == default_toolchain) { + "//chrome/browser/ui/android/management:java_resources", + "//chrome/browser/ui/android/omnibox:java_resources", + "//chrome/browser/ui/android/quickactionsearchwidget:java_resources", ++ "//chrome/browser/ui/android/signin:java_resources", + "//chrome/browser/ui/android/strings:ui_strings_grd", + "//chrome/browser/ui/android/theme:java_resources", + "//chrome/browser/ui/android/toolbar:java_resources", +diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java +--- a/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java ++++ b/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedActionDelegateImpl.java +@@ -19,7 +19,6 @@ import org.chromium.chrome.browser.offlinepages.OfflinePageBridge; + import org.chromium.chrome.browser.offlinepages.RequestCoordinatorBridge; + import org.chromium.chrome.browser.profiles.Profile; + import org.chromium.chrome.browser.share.crow.CrowButtonDelegate; +-import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl; + import org.chromium.chrome.browser.suggestions.SuggestionsConfig; + import org.chromium.chrome.browser.tab.EmptyTabObserver; + import org.chromium.chrome.browser.tab.Tab; +@@ -129,8 +128,6 @@ public class FeedActionDelegateImpl implements FeedActionDelegate { + @Override + public void showSignInActivity() { + if (ChromeFeatureList.isEnabled(ChromeFeatureList.FEED_SHOW_SIGN_IN_COMMAND)) { +- SyncConsentActivityLauncherImpl.get().launchActivityIfAllowed( +- mActivityContext, SigninAccessPoint.NTP_CONTENT_SUGGESTIONS); + } + } + +-- +2.25.1 diff --git a/build/patches/00Timezone-customization--add-fixup-.patch b/build/patches/00Timezone-customization--add-fixup-.patch new file mode 100644 index 00000000..68116b47 --- /dev/null +++ b/build/patches/00Timezone-customization--add-fixup-.patch @@ -0,0 +1,28 @@ +From: Your Name +Date: Thu, 5 Jan 2023 11:36:46 +0000 +Subject: Timezone customization (add fixup) + +--- + .../core/browser/content_settings_registry.cc | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc +--- a/components/content_settings/core/browser/content_settings_registry.cc ++++ b/components/content_settings/core/browser/content_settings_registry.cc +@@ -614,10 +614,10 @@ void ContentSettingsRegistry::Init() { + + Register(ContentSettingsType::TIMEZONE_OVERRIDE, "timezone-override", CONTENT_SETTING_ALLOW, + WebsiteSettingsInfo::SYNCABLE, +- AllowlistedSchemes(kChromeUIScheme, kChromeDevToolsScheme), +- ValidSettings(CONTENT_SETTING_ALLOW, // use system time +- CONTENT_SETTING_ASK, // custom timezone, default UTC +- CONTENT_SETTING_BLOCK), // random ++ /*allowlisted_schemes=*/{}, ++ /*valid_settings=*/{CONTENT_SETTING_ALLOW, // use system time ++ CONTENT_SETTING_ASK, // custom timezone, default UTC ++ CONTENT_SETTING_BLOCK}, // random + WebsiteSettingsInfo::TOP_ORIGIN_ONLY_SCOPE, + WebsiteSettingsRegistry::PLATFORM_ANDROID, + ContentSettingsInfo::INHERIT_IN_INCOGNITO, +-- +2.25.1 diff --git a/build/patches/00User-agent-customization--add-fixup-.patch b/build/patches/00User-agent-customization--add-fixup-.patch new file mode 100644 index 00000000..d9cab733 --- /dev/null +++ b/build/patches/00User-agent-customization--add-fixup-.patch @@ -0,0 +1,31 @@ +From: Your Name +Date: Thu, 5 Jan 2023 11:30:19 +0000 +Subject: User agent customization (add fixup) + +--- + .../android/preferences/privacy_preferences_manager_impl.cc | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc +--- a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc ++++ b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc +@@ -17,6 +17,7 @@ + #include "base/command_line.h" + #include "base/base_switches.h" + #include "chrome/common/chrome_switches.h" ++#include "content/browser/attribution_reporting/attribution_manager.h" + #include "content/browser/renderer_host/render_process_host_impl.h" + #include "content/common/renderer.mojom.h" + #include "chrome/browser/chrome_content_browser_client.h" +@@ -88,7 +89,8 @@ static void UpdateOverrideUserAgent() { + std::vector cors_exempt_header_list; + iter.GetCurrentValue()->GetRendererInterface()->InitializeRenderer( + /*user_agent*/ ua, /*full_user_agent*/ ua, /*reduced_user_agent*/ ua, +- /*metadata*/ blink::UserAgentMetadata(), cors_exempt_header_list); ++ /*metadata*/ blink::UserAgentMetadata(), cors_exempt_header_list, ++ content::AttributionManager::GetOsSupport()); + } + } + } +-- +2.25.1