PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

final patches for v112

Browse Source
This commit is contained in:
Carmelo Messina
2023-04-03 16:06:59 +02:00
parent f8ed43d77d
commit fe1dc4c82a
40 changed files with 1806 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/bromite_patches_list.txt
+1 -1
View File
@@ -216,7 +216,7 @@ Add-kill-switch-for-unsupported-clangd-flags.patch
00WIN-ADDTO-Remove-EV-certificates.patch
00WIN-ADDTO-AImageReader-CFI-crash-mitigations.patch
00WIN-ADDTO-Remove-binary-blob-integrations.patch
00WIN-ADDTO-Enable-native-Android-autofill.patch
00WIN-ADDTO-Remove-signin-and-sync-integrations.patch
00WIN-ADDTO-Add-lifetime-options-for-permissions.patch
00WIN-ADDTO-Disable-various-metrics.patch
build/patches/00AdblockPlus.patch
+13 -13
View File
@@ -1186,7 +1186,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//components/autofill/android:autofill_java_resources",
"//components/autofill/android:autofill_payments_java_resources",
"//components/blocked_content/android:java_resources",
@@ -363,6 +368,7 @@ if (current_toolchain == default_toolchain) {
@@ -365,6 +370,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/webapps/android:java",
"//chrome/browser/webauthn/android:java",
"//chrome/browser/xsurface:java",
@@ -1194,7 +1194,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//components/autofill/android:autofill_java",
"//components/autofill/android:prefeditor_autofill_java",
"//components/background_task_scheduler:background_task_scheduler_java",
@@ -1484,6 +1490,7 @@ if (current_toolchain == default_toolchain) {
@@ -1486,6 +1492,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/test/android:chrome_java_integration_test_support",
"//chrome/test/android:chrome_java_test_pagecontroller",
"//chrome/test/android/test_trusted_web_activity:test_trusted_web_activity_java",
@@ -1202,7 +1202,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//components/autofill/android:autofill_java",
"//components/autofill/android:prefeditor_autofill_java",
"//components/background_task_scheduler:background_task_scheduler_java",
@@ -1666,6 +1673,7 @@ if (current_toolchain == default_toolchain) {
@@ -1668,6 +1675,7 @@ if (current_toolchain == default_toolchain) {
srcjar_deps = [ "//chrome/browser:tos_dialog_behavior_generated_enum" ]
data = [
@@ -1210,7 +1210,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/test/data/android/",
"//chrome/test/data/autofill/",
"//chrome/test/data/background_sync/",
@@ -3639,6 +3647,7 @@ group("jni_headers") {
@@ -3641,6 +3649,7 @@ group("jni_headers") {
"//chrome/browser/ui/messages/android:jni_headers",
"//chrome/browser/util:jni_headers",
"//chrome/browser/webauthn/android:jni_headers",
@@ -9166,7 +9166,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/android/explore_sites/explore_sites_service_factory.h"
#include "chrome/browser/android/reading_list/reading_list_manager_factory.h"
#include "chrome/browser/android/reading_list/reading_list_notification_service_factory.h"
@@ -570,9 +584,19 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -569,9 +583,19 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
ExitTypeServiceFactory::GetInstance();
#endif
@@ -9783,7 +9783,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/browsing_data/core:core",
"//components/enterprise:enterprise",
"//components/enterprise:test_support",
@@ -1342,6 +1347,7 @@ if (!is_android) {
@@ -1340,6 +1345,7 @@ if (!is_android) {
"//chrome/test/data/webui:resources_grit",
"//chrome/test/media_router/access_code_cast:access_code_cast_integration_base",
"//chrome/test/payments:test_support",
@@ -9791,7 +9791,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/autofill/content/browser:risk_proto",
"//components/autofill/content/browser:test_support",
"//components/autofill/content/common/mojom",
@@ -1644,6 +1650,7 @@ if (!is_android) {
@@ -1642,6 +1648,7 @@ if (!is_android) {
"data/",
"//ash/components/arc/test/data/icons",
"//chrome/browser/page_load_metrics/integration_tests/data/",
@@ -9799,7 +9799,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//chrome/test/data/cart/",
"//components/test/data/ad_tagging/",
"//components/test/data/ads_observer/",
@@ -1735,6 +1742,14 @@ if (!is_android) {
@@ -1733,6 +1740,14 @@ if (!is_android) {
"../browser/accessibility/image_annotation_browsertest.cc",
"../browser/accessibility/interstitial_accessibility_browsertest.cc",
"../browser/accessibility/page_colors_browsertest.cc",
@@ -9814,7 +9814,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/apps/guest_view/app_view_browsertest.cc",
"../browser/apps/guest_view/web_view_browsertest.cc",
"../browser/apps/platform_apps/app_browsertest.cc",
@@ -2416,6 +2431,10 @@ if (!is_android) {
@@ -2414,6 +2429,10 @@ if (!is_android) {
sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ]
}
@@ -9825,7 +9825,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
if (enable_reporting) {
sources += [ "../browser/net/reporting_browsertest.cc" ]
}
@@ -3204,6 +3223,12 @@ if (!is_android) {
@@ -3202,6 +3221,12 @@ if (!is_android) {
"../browser/ui/views/web_apps/web_app_identity_update_confirmation_view_browsertest.cc",
]
@@ -9838,7 +9838,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
if (is_chromeos_ash && enable_extensions) {
deps +=
[ "//chromeos/ash/components/network/portal_detector:test_support" ]
@@ -5337,6 +5362,7 @@ test("unit_tests") {
@@ -5335,6 +5360,7 @@ test("unit_tests") {
# All unittests in browser, common, renderer and service.
"../browser/about_flags_unittest.cc",
"../browser/active_use_util_unittest.cc",
@@ -9846,7 +9846,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"../browser/after_startup_task_utils_unittest.cc",
"../browser/apps/user_type_filter_unittest.cc",
"../browser/autocomplete/chrome_autocomplete_provider_client_unittest.cc",
@@ -5940,6 +5966,8 @@ test("unit_tests") {
@@ -5938,6 +5964,8 @@ test("unit_tests") {
"//chrome/services/qrcode_generator/public/cpp",
"//chrome/test/data:chrome_test_resources_grit",
"//components/account_id",
@@ -9855,7 +9855,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/assist_ranker/proto",
"//components/autofill/content/browser:test_support",
"//components/background_sync",
@@ -9185,6 +9213,7 @@ if (!is_android) {
@@ -9183,6 +9211,7 @@ if (!is_android) {
public_deps = [
"//chrome/browser:test_support_ui",
build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch
+35 -9
View File
@@ -47,13 +47,13 @@ Subject: Eyeo Adblock Remove
components/resources/BUILD.gn | 1 -
components/resources/adblock_resources.grdp | 3 -
components/resources/adblocking/.gitignore | 2 +-
components/resources/adblocking/BUILD.gn | 4 +-
components/resources/adblocking/BUILD.gn | 30 +-
.../snippets/dist/isolated-first.jst | 62 +
.../snippets/dist/isolated-first.source.jst | 3126 +++++++++++++++++
.../blink/renderer/core/css/style_engine.cc | 8 +
.../blink/renderer/core/css/style_engine.h | 1 +
.../renderer/core/exported/web_document.cc | 13 +-
50 files changed, 3279 insertions(+), 1131 deletions(-)
50 files changed, 3278 insertions(+), 1158 deletions(-)
delete mode 100644 chrome/browser/adblock/adblock_telemetry_service_factory.cc
delete mode 100644 chrome/browser/adblock/adblock_telemetry_service_factory.h
rename components/adblock/android/java/res/xml/{adblock_preferences.xml => eyeo_adblock_preferences.xml} (100%)
@@ -370,7 +370,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#include "chrome/browser/adblock/resource_classification_runner_factory.h"
#include "chrome/browser/adblock/session_stats_factory.h"
#include "chrome/browser/adblock/sitekey_storage_factory.h"
@@ -585,7 +584,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -584,7 +583,6 @@ void ChromeBrowserMainExtraPartsProfiles::
ExitTypeServiceFactory::GetInstance();
#endif
adblock::AdblockControllerFactory::GetInstance();
@@ -1895,15 +1895,41 @@ diff --git a/components/resources/adblocking/BUILD.gn b/components/resources/adb
compiled_action(target_name) {
tool = "//components/adblock/core/converter:adblock_flatbuffer_converter"
inputs = [ invoker.input ]
@@ -51,7 +51,7 @@ make_preloaded_subscription("make_anticv") {
output = "${target_gen_dir}/anticv.fb"
@@ -31,34 +31,6 @@ template("make_preloaded_subscription") {
}
}
-# Note, url is *not* used to download the list during build time, only to
-# identify the subscription. Consider it metadata.
-make_preloaded_subscription("make_easylist") {
- input = "//components/resources/adblocking/easylist.txt.gz"
- url = "https://easylist-downloads.adblockplus.org/easylist.txt"
- output = "${target_gen_dir}/easylist.fb"
-}
-
-make_preloaded_subscription("make_exceptionrules") {
- input = "//components/resources/adblocking/exceptionrules.txt.gz"
- url = "https://easylist-downloads.adblockplus.org/exceptionrules.txt"
- output = "${target_gen_dir}/exceptionrules.fb"
-}
-
-make_preloaded_subscription("make_anticv") {
- input = "//components/resources/adblocking/anticv.txt.gz"
- url = "https://easylist-downloads.adblockplus.org/abp-filters-anti-cv.txt"
- output = "${target_gen_dir}/anticv.fb"
-}
-
-group("make_all_preloaded_subscriptions") {
+group("make_all_preloaded_subscriptions_NO") {
deps = [
":make_anticv",
":make_easylist",
- deps = [
- ":make_anticv",
- ":make_easylist",
- ":make_exceptionrules",
- ]
-}
-
copy("copy_snippets_lib") {
if (is_debug) {
sources = [ "//components/resources/adblocking/snippets/dist/isolated-first.source.jst" ]
diff --git a/components/resources/adblocking/snippets/dist/isolated-first.jst b/components/resources/adblocking/snippets/dist/isolated-first.jst
new file mode 100755
--- /dev/null
build/patches/00WIN-ADDTO-Disable-safe-browsing.patch
+71 -19
View File
@@ -7,7 +7,7 @@ Subject: WIN ADDTO Disable safe browsing
.../chrome_browsing_data_remover_delegate.cc | 2 -
chrome/browser/chrome_browser_main_win.cc | 6 -
.../bubble/download_bubble_controller.cc | 2 +
.../chrome_download_manager_delegate.cc | 4 +-
.../chrome_download_manager_delegate.cc | 16 +-
.../browser/download/download_item_model.cc | 93 +---------
.../analysis/content_analysis_delegate.cc | 164 +-----------------
.../analysis/content_analysis_delegate.h | 7 -
@@ -43,18 +43,18 @@ Subject: WIN ADDTO Disable safe browsing
.../ui/views/download/download_item_view.cc | 23 +--
.../webui/downloads/downloads_dom_handler.cc | 21 +--
.../ui/webui/downloads/downloads_ui.cc | 5 +-
chrome/browser/ui/webui/intro/intro_ui.cc | 11 +-
chrome/browser/ui/webui/intro/intro_ui.cc | 33 +---
chrome/browser/webshare/share_service_impl.cc | 4 +
chrome/chrome_paks.gni | 2 -
.../public/cpp/sandboxed_rar_analyzer.cc | 16 +-
.../public/cpp/sandboxed_rar_analyzer.h | 2 -
.../public/cpp/sandboxed_zip_analyzer.h | 2 -
chrome/test/BUILD.gn | 5 -
chrome/test/BUILD.gn | 4 -
.../browser/mojo_safe_browsing_impl.cc | 1 +
.../core/common/safe_browsing_prefs.cc | 2 +-
printing/buildflags/buildflags.gni | 2 +-
.../tracked_persistent_pref_store_factory.cc | 10 +-
51 files changed, 73 insertions(+), 795 deletions(-)
51 files changed, 74 insertions(+), 827 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
@@ -82,7 +82,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/share",
"//chrome/browser/sharing:buildflags",
"//chrome/browser/sharing/proto",
@@ -3655,18 +3648,12 @@ static_library("browser") {
@@ -3657,18 +3650,12 @@ static_library("browser") {
"enterprise/connectors/analysis/analysis_service_settings.h",
"enterprise/connectors/analysis/analysis_settings.cc",
"enterprise/connectors/analysis/analysis_settings.h",
@@ -101,7 +101,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"enterprise/connectors/analysis/request_handler_base.cc",
"enterprise/connectors/analysis/request_handler_base.h",
"enterprise/connectors/common.cc",
@@ -7918,7 +7905,6 @@ static_library("test_support") {
@@ -7920,7 +7907,6 @@ static_library("test_support") {
":browser",
"//chrome/browser/autofill:test_support",
"//chrome/browser/profiles:profile",
@@ -154,7 +154,38 @@ diff --git a/chrome/browser/download/bubble/download_bubble_controller.cc b/chro
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -1706,8 +1706,8 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAllowed(
@@ -880,21 +880,11 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
content::DownloadItemUtils::GetWebContents(download);
Browser* browser =
web_contents ? chrome::FindBrowserWithWebContents(web_contents) : nullptr;
- std::unique_ptr<chrome::ScopedTabbedBrowserDisplayer> browser_displayer;
- if (!browser ||
- !browser->CanSupportWindowFeature(Browser::FEATURE_TABSTRIP)) {
- browser_displayer =
- std::make_unique<chrome::ScopedTabbedBrowserDisplayer>(profile_);
- browser = browser_displayer->browser();
- }
content::OpenURLParams params(
net::FilePathToFileURL(download->GetTargetFilePath()),
content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
ui::PAGE_TRANSITION_LINK, false);
- if (download->GetMimeType() == "application/x-x509-user-cert")
- chrome::ShowSettingsSubPage(browser, "certificates");
- else
browser->OpenURL(params);
#endif // BUILDFLAG(IS_ANDROID)
}
@@ -942,7 +932,7 @@ void ChromeDownloadManagerDelegate::ShowDownloadInShell(
std::string
ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
- return std::string(chrome::kApplicationClientIDStringForAVScanning);
+ return std::string();
}
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -1706,8 +1696,8 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAllowed(
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
@@ -1701,10 +1732,13 @@ diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui
namespace {
#if BUILDFLAG(IS_CHROMEOS_LACROS)
std::string GetPictureUrl(content::WebUI& web_ui,
@@ -98,9 +103,11 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd(
profile, chrome::kChromeUIIntroHost);
@@ -95,12 +100,11 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
DCHECK(base::FeatureList::IsEnabled(kForYouFre));
auto* profile = Profile::FromWebUI(web_ui);
- content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd(
- profile, chrome::kChromeUIIntroHost);
-
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
webui::SetupWebUIDataSource(
source, base::make_span(kIntroResources, kIntroResourcesSize),
@@ -1713,6 +1747,32 @@ diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
int title_id = 0;
@@ -126,25 +130,6 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
}
#endif
- webui::LocalizedString localized_strings[] = {
-#if BUILDFLAG(ENABLE_DICE_SUPPORT)
- {"pageTitle", title_id},
- {"pageSubtitle", subtitle_id},
- {"devicesCardTitle", IDS_FRE_DEVICES_CARD_TITLE},
- {"devicesCardDescription", IDS_FRE_DEVICES_CARD_DESCRIPTION},
- {"securityCardTitle", IDS_FRE_SECURITY_CARD_TITLE},
- {"securityCardDescription", IDS_FRE_SECURITY_CARD_DESCRIPTION},
- {"backupCardTitle", IDS_FRE_BACKUP_CARD_TITLE},
- {"backupCardDescription", IDS_FRE_BACKUP_CARD_DESCRIPTION},
- {"declineSignInButtonTitle", IDS_FRE_DECLINE_SIGN_IN_BUTTON_TITLE},
- {"acceptSignInButtonTitle", IDS_FRE_ACCEPT_SIGN_IN_BUTTON_TITLE},
-#endif
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
- {"proceedLabel", IDS_PRIMARY_PROFILE_FIRST_RUN_NEXT_BUTTON_LABEL},
-#endif
- };
- source->AddLocalizedStrings(localized_strings);
-
// TODO(crbug.com/1409028): Replace this function by a call to
// chrome::GetDeviceManagerIdentity()
const bool is_device_managed = chrome::ShouldDisplayManagedUi(profile);
diff --git a/chrome/browser/webshare/share_service_impl.cc b/chrome/browser/webshare/share_service_impl.cc
--- a/chrome/browser/webshare/share_service_impl.cc
+++ b/chrome/browser/webshare/share_service_impl.cc
@@ -1854,15 +1914,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//chrome/browser/sharing/proto",
"//chrome/child",
"//chrome/common:non_code_constants",
@@ -1326,7 +1325,6 @@ if (!is_android) {
"//chrome/browser/resource_coordinator:mojo_bindings",
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/safe_browsing:advanced_protection",
- "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
"//chrome/browser/segmentation_platform:test_utils",
"//chrome/browser/sharing/proto",
"//chrome/browser/storage_access_api:permissions",
@@ -5935,9 +5933,6 @@ test("unit_tests") {
@@ -5933,9 +5932,6 @@ test("unit_tests") {
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/profiling_host",
"//chrome/browser/push_messaging:budget_proto",
build/patches/00WIN-ADDTO-Enable-native-Android-autofill.patch
-58
View File
@@ -1,58 +0,0 @@
From: Your Name <you@example.com>
Date: Wed, 12 Oct 2022 11:46:45 +0000
Subject: WIN ADDTO Enable native Android autofill
---
chrome/browser/extensions/extension_view_host.cc | 3 ++-
.../views/media_router/presentation_receiver_window_view.cc | 3 ++-
.../content/browser/content_autofill_driver_factory.cc | 6 ++++++
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/chrome/browser/extensions/extension_view_host.cc b/chrome/browser/extensions/extension_view_host.cc
--- a/chrome/browser/extensions/extension_view_host.cc
+++ b/chrome/browser/extensions/extension_view_host.cc
@@ -59,7 +59,8 @@ ExtensionViewHost::ExtensionViewHost(const Extension* extension,
base::BindRepeating(
&autofill::BrowserDriverInitHook,
autofill::ChromeAutofillClient::FromWebContents(host_contents()),
- g_browser_process->GetApplicationLocale()));
+ g_browser_process->GetApplicationLocale(),
+ /*enable_secondary_autofill_manager*/ false));
// The popup itself cannot be zoomed, but we must specify a zoom level to use.
// Otherwise, if a user zooms a page of the same extension, the popup would
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
--- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
+++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
@@ -174,7 +174,8 @@ void PresentationReceiverWindowView::Init() {
base::BindRepeating(
&autofill::BrowserDriverInitHook,
autofill::ChromeAutofillClient::FromWebContents(web_contents),
- g_browser_process->GetApplicationLocale()));
+ g_browser_process->GetApplicationLocale(),
+ /*enable_secondary_autofill_manager*/ false));
ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
web_contents,
autofill::ChromeAutofillClient::FromWebContents(web_contents));
diff --git a/components/autofill/content/browser/content_autofill_driver_factory.cc b/components/autofill/content/browser/content_autofill_driver_factory.cc
--- a/components/autofill/content/browser/content_autofill_driver_factory.cc
+++ b/components/autofill/content/browser/content_autofill_driver_factory.cc
@@ -45,10 +45,16 @@ void BrowserDriverInitHook(AutofillClient* client,
const std::string& app_locale,
bool enable_secondary_autofill_manager,
ContentAutofillDriver* driver) {
+#if BUILDFLAG(IS_ANDROID)
driver->set_autofill_manager(
std::make_unique<BrowserAutofillManager>(driver, client, app_locale));
enable_secondary_autofill_manager == false ? nullptr :
base::WrapUnique(new AndroidAutofillManager(driver, client)));
+#else
+ driver->set_autofill_manager(std::make_unique<BrowserAutofillManager>(
+ driver, client, app_locale,
+ AutofillManager::EnableDownloadManager(false)), nullptr);
+#endif
if (client && ShouldEnableHeavyFormDataScraping(client->GetChannel()))
driver->GetAutofillAgent()->EnableHeavyFormDataScraping();
}
--
2.25.1
build/patches/00WIN-ADDTO-Experimental-user-scripts-support.patch
+3 -3
View File
@@ -20,7 +20,7 @@ Subject: WIN ADDTO Experimental user scripts support
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3490,11 +3490,13 @@ static_library("browser") {
@@ -3492,11 +3492,13 @@ static_library("browser") {
]
deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
}
@@ -87,7 +87,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -406,7 +406,9 @@
@@ -408,7 +408,9 @@
#include "chrome/browser/user_notes/user_note_service_factory.h"
#endif
@@ -97,7 +97,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
namespace chrome {
@@ -941,7 +943,9 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -933,7 +935,9 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
WebDataServiceFactory::GetInstance();
webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
build/patches/00WIN-ADDTO-Eyeo-Adblock.patch
+1 -1
View File
@@ -9,7 +9,7 @@ Subject: WIN ADDTO Eyeo Adblock
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2430,10 +2430,6 @@ if (!is_android) {
@@ -2428,10 +2428,6 @@ if (!is_android) {
sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ]
}
build/patches/00WIN-ADDTO-Remove-signin-and-sync-integrations.patch
+2 -2
View File
@@ -26,7 +26,7 @@ Subject: WIN ADDTO Remove signin and sync integrations
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4163,8 +4163,6 @@ static_library("browser") {
@@ -4165,8 +4165,6 @@ static_library("browser") {
"sharing_hub/sharing_hub_service_factory.h",
"signin/signin_promo.cc",
"signin/signin_promo.h",
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"signin/signin_ui_util.cc",
"signin/signin_ui_util.h",
"speech/chrome_speech_recognition_service.cc",
@@ -6710,12 +6708,6 @@ static_library("browser") {
@@ -6712,12 +6710,6 @@ static_library("browser") {
"signin/signin_ui_delegate_impl_dice.cc",
"signin/signin_ui_delegate_impl_dice.h",
]
build/patches/00WIN-Fix-windows-build.patch
+31 -14
View File
@@ -6,10 +6,10 @@ Subject: WIN Fix windows build
.../browser_process_platform_part_win.cc | 3 ++
chrome/browser/devtools/devtools_window.cc | 1 +
chrome/browser/ui/profile_picker.cc | 2 +-
.../browser/ui/startup/first_run_service.cc | 13 ++------
.../browser/ui/startup/first_run_service.cc | 14 +++-----
chrome/browser/updater/BUILD.gn | 9 -----
.../browser/updater/browser_updater_client.cc | 33 +------------------
6 files changed, 9 insertions(+), 52 deletions(-)
6 files changed, 10 insertions(+), 52 deletions(-)
diff --git a/chrome/browser/browser_process_platform_part_win.cc b/chrome/browser/browser_process_platform_part_win.cc
--- a/chrome/browser/browser_process_platform_part_win.cc
@@ -56,7 +56,23 @@ diff --git a/chrome/browser/ui/profile_picker.cc b/chrome/browser/ui/profile_pic
diff --git a/chrome/browser/ui/startup/first_run_service.cc b/chrome/browser/ui/startup/first_run_service.cc
--- a/chrome/browser/ui/startup/first_run_service.cc
+++ b/chrome/browser/ui/startup/first_run_service.cc
@@ -164,9 +164,6 @@ enum class FinishedReason {
@@ -47,6 +47,7 @@
namespace {
bool IsFirstRunEligibleProfile(Profile* profile) {
+ if ((true)) return false;
if (profile->IsOffTheRecord()) {
return false;
}
@@ -74,6 +75,7 @@ bool IsFirstRunEligibleProfile(Profile* profile) {
}
bool IsFirstRunEligibleProcess() {
+ if ((true)) return false;
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
// On Lacros we want to run the FRE beyond the strict first run as defined by
// `IsChromeFirstRun()` for a few reasons:
@@ -164,9 +166,6 @@ enum class FinishedReason {
};
void SetFirstRunFinished(FinishedReason reason) {
@@ -66,7 +82,7 @@ diff --git a/chrome/browser/ui/startup/first_run_service.cc b/chrome/browser/ui/
#if BUILDFLAG(IS_CHROMEOS_LACROS)
absl::optional<ProfileMetrics::ProfileSignedInFlowOutcome> outcome;
switch (reason) {
@@ -193,9 +190,7 @@ void SetFirstRunFinished(FinishedReason reason) {
@@ -193,9 +192,7 @@ void SetFirstRunFinished(FinishedReason reason) {
// with it, or if for some other reason (e.g. policy or some other browser
// state) we determine that we should not show it.
bool IsFirstRunMarkedFinishedInPrefs() {
@@ -77,14 +93,23 @@ diff --git a/chrome/browser/ui/startup/first_run_service.cc b/chrome/browser/ui/
}
// Processes the outcome from the FRE and resumes the user's interrupted task.
@@ -234,7 +229,6 @@ void OnFirstRunHasExited(ResumeTaskCallback original_intent_callback,
@@ -234,8 +231,6 @@ void OnFirstRunHasExited(ResumeTaskCallback original_intent_callback,
// static
void FirstRunService::RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
- registry->RegisterBooleanPref(prefs::kFirstRunFinished, false);
registry->RegisterStringPref(prefs::kFirstRunStudyGroup, "");
- registry->RegisterStringPref(prefs::kFirstRunStudyGroup, "");
}
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
@@ -318,7 +313,6 @@ void FirstRunService::TryMarkFirstRunAlreadyFinished(
return;
}
- auto* identity_manager = IdentityManagerFactory::GetForProfile(profile_);
bool has_set_up_profile =
#if BUILDFLAG(IS_CHROMEOS_LACROS)
// Indicates that the profile was likely migrated from pre-Lacros Ash.
@@ -328,7 +322,7 @@ void FirstRunService::TryMarkFirstRunAlreadyFinished(
// the profile already has an account (e.g. the sentinel file was deleted
// or `--force-first-run` was passed), this ensures we still skip it and
@@ -94,14 +119,6 @@ diff --git a/chrome/browser/ui/startup/first_run_service.cc b/chrome/browser/ui/
#endif
if (has_set_up_profile) {
SetFirstRunFinished(FinishedReason::kProfileAlreadySetUp);
@@ -495,6 +489,5 @@ bool FirstRunServiceFactory::ServiceIsCreatedWithBrowserContext() const {
// Helpers ---------------------------------------------------------------------
bool ShouldOpenFirstRun(Profile* profile) {
- return IsFirstRunEligibleProcess() && IsFirstRunEligibleProfile(profile) &&
- !IsFirstRunMarkedFinishedInPrefs();
+ return false;
}
diff --git a/chrome/browser/updater/BUILD.gn b/chrome/browser/updater/BUILD.gn
--- a/chrome/browser/updater/BUILD.gn
+++ b/chrome/browser/updater/BUILD.gn
build/patches/00add-browser-policy.patch
+1 -14
View File
@@ -11,7 +11,6 @@ Subject: Add browser policy
chrome/browser/signin/chrome_signin_client.cc | 6 +-
.../ui/webui/policy/policy_ui_handler.cc | 105 ++++++++++++++-
.../ui/webui/policy/policy_ui_handler.h | 2 +
.../commerce/core/commerce_feature_list.cc | 2 +-
.../core/browser/browser_policy_connector.cc | 3 +
.../common/command_line_policy_provider.cc | 3 +
components/policy/core/common/features.cc | 4 +-
@@ -28,7 +27,7 @@ Subject: Add browser policy
components/signin/features.gni | 6 +-
.../gaia_cookie_manager_service.cc | 4 +
google_apis/gaia/gaia_auth_fetcher.cc | 1 +
25 files changed, 296 insertions(+), 36 deletions(-)
24 files changed, 295 insertions(+), 35 deletions(-)
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
@@ -323,18 +322,6 @@ diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.h b/chrome/browser
void HandleListenPoliciesUpdates(const base::Value::List& args);
void HandleReloadPolicies(const base::Value::List& args);
void HandleCopyPoliciesJson(const base::Value::List& args);
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
@@ -145,7 +145,7 @@ BASE_FEATURE(kCommercePriceTracking,
const base::FeatureParam<bool> kDeleteAllMerchantsOnClearBrowsingHistory{
&kCommerceMerchantViewer, "delete_all_merchants_on_clear_history", false};
-BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT);
+BASE_FEATURE(kShoppingList, "ShoppingList", base::FEATURE_DISABLED_BY_DEFAULT); // guard this
#if BUILDFLAG(IS_ANDROID)
BASE_FEATURE(kShoppingListRegionLaunched,
"ShoppingListRegionLaunched",
diff --git a/components/policy/core/browser/browser_policy_connector.cc b/components/policy/core/browser/browser_policy_connector.cc
--- a/components/policy/core/browser/browser_policy_connector.cc
+++ b/components/policy/core/browser/browser_policy_connector.cc
build/patches/Add-a-proxy-configuration-page.patch
+1 -1
View File
@@ -76,7 +76,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -64,6 +64,7 @@ public class PrivacySettings
@@ -65,6 +65,7 @@ public class PrivacySettings
private static final String PREF_DO_NOT_TRACK = "do_not_track";
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
build/patches/Add-an-always-incognito-mode.patch
+5 -7
View File
@@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../CustomTabAppMenuPropertiesDelegate.java | 4 +
.../CustomTabIntentDataProvider.java | 5 +-
.../browser/download/DownloadUtils.java | 16 +-
.../browser/history/HistoryManager.java | 30 +++-
.../browser/history/HistoryManager.java | 28 ++-
.../chrome/browser/history/HistoryPage.java | 16 ++
.../native_page/NativePageFactory.java | 4 +-
.../chrome/browser/ntp/RecentTabsManager.java | 28 ++-
@@ -84,7 +84,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../omnibox/browser/base_search_provider.cc | 2 +-
components/omnibox/browser/search_provider.cc | 4 +-
.../host_content_settings_map_factory.cc | 1 +
65 files changed, 739 insertions(+), 82 deletions(-)
65 files changed, 737 insertions(+), 82 deletions(-)
create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
@@ -562,7 +562,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
return;
} else if (isHistoryClustersUIShowing()) {
toHistoryClusters = false;
@@ -653,11 +660,26 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
@@ -653,11 +660,24 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
&& mContentView == mHistoryClustersCoordinator.getActivityContentView();
}
@@ -576,9 +576,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
+ prefService.getBoolean(Pref.INCOGNITO_TAB_HISTORY_ENABLED);
+ if (historyEnabledInIncognito) return false;
+ }
+ return mIsIncognito
+ && ChromeFeatureList.isEnabled(
+ ChromeFeatureList.UPDATE_HISTORY_ENTRY_POINTS_IN_INCOGNITO);
+ return mIsIncognito;
+ }
+
/**
@@ -590,7 +588,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
// If Incognito placeholder is shown no need to call any destroy method.
return;
}
@@ -677,7 +699,7 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
@@ -677,7 +697,7 @@ public class HistoryManager implements OnMenuItemClickListener, SelectionObserve
* @return True if manager handles this event, false if it decides to ignore.
*/
public boolean onBackPressed() {
build/patches/Add-bookmark-import-export-actions.patch
+4 -4
View File
@@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* Provides the communication channel for Android to fetch and manipulate the
* bookmark model stored in native.
@@ -434,6 +473,209 @@ class BookmarkBridge {
@@ -425,6 +464,209 @@ class BookmarkBridge {
mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType());
}
@@ -492,7 +492,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* Synchronously gets a list of bookmarks that match the specified search query.
* @param query Keyword used for searching bookmarks.
@@ -918,6 +1160,39 @@ class BookmarkBridge {
@@ -909,6 +1151,39 @@ class BookmarkBridge {
depthList.add(depth);
}
@@ -532,7 +532,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
for (int i = 0; i < left.length; i++) {
@@ -951,6 +1226,9 @@ class BookmarkBridge {
@@ -942,6 +1217,9 @@ class BookmarkBridge {
int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type);
void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type,
List<BookmarkId> bookmarksList);
@@ -727,7 +727,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
configs += [
"//build/config/compiler:wexit_time_destructors",
"//build/config:precompiled_headers",
@@ -3475,8 +3484,6 @@ static_library("browser") {
@@ -3477,8 +3486,6 @@ static_library("browser") {
"badging/badge_manager_factory.h",
"banners/app_banner_manager_desktop.cc",
"banners/app_banner_manager_desktop.h",
build/patches/Add-custom-tab-intents-privacy-option.patch
+4 -4
View File
@@ -126,7 +126,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Inco
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -82,6 +82,9 @@ public class PrivacySettings
@@ -83,6 +83,9 @@ public class PrivacySettings
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
private IncognitoLockSettings mIncognitoLockSettings;
@@ -136,7 +136,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
PrivacyPreferencesManagerImpl privacyPrefManager =
@@ -173,6 +176,9 @@ public class PrivacySettings
@@ -174,6 +177,9 @@ public class PrivacySettings
updatePreferences();
}
@@ -146,7 +146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = preference.getKey();
@@ -189,6 +195,14 @@ public class PrivacySettings
@@ -190,6 +196,14 @@ public class PrivacySettings
} else if (PREF_SEARCH_SUGGESTIONS.equals(key)) {
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(Pref.SEARCH_SUGGEST_ENABLED, (boolean) newValue);
@@ -161,7 +161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
}
return true;
}
@@ -211,6 +225,16 @@ public class PrivacySettings
@@ -212,6 +226,16 @@ public class PrivacySettings
canMakePaymentPref.setChecked(prefService.getBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED));
}
build/patches/Add-flag-to-disable-vibration.patch
+1 -1
View File
@@ -75,7 +75,7 @@ diff --git a/content/public/common/content_features.cc b/content/public/common/c
+// Enables vibration; an user gesture will still be required if enabled.
+BASE_FEATURE(kVibration,
+ "Vibration",
+ "VibrationEnabled",
+ base::FEATURE_DISABLED_BY_DEFAULT);
+
// When this feature is enabled, private network requests initiated from
build/patches/Add-lifetime-options-for-permissions.patch
+1 -1
View File
@@ -181,7 +181,7 @@ diff --git a/chrome/browser/permissions/last_tab_standing_tracker_factory.cc b/c
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -614,10 +614,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -613,10 +613,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
KAnonymityServiceFactory::GetInstance();
LanguageModelManagerFactory::GetInstance();
build/patches/Add-menu-item-to-bookmark-all-tabs.patch
+6 -6
View File
@@ -130,7 +130,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private long mNativeBookmarkBridge;
private boolean mIsDestroyed;
private boolean mIsDoingExtensiveChanges;
@@ -378,6 +385,16 @@ class BookmarkBridge {
@@ -372,6 +379,16 @@ class BookmarkBridge {
mNativeBookmarkBridge, BookmarkBridge.this);
}
@@ -147,7 +147,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* @return Id representing the special "other" folder from bookmark model.
*/
@@ -1001,6 +1018,49 @@ class BookmarkBridge {
@@ -992,6 +1009,49 @@ class BookmarkBridge {
mNativeBookmarkBridge, BookmarkBridge.this, title, url);
}
@@ -197,7 +197,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* @param url The URL of the reading list item.
* @return The reading list item with the URL, or null if no such reading list item.
@@ -1217,6 +1277,7 @@ class BookmarkBridge {
@@ -1208,6 +1268,7 @@ class BookmarkBridge {
void getAllFoldersWithDepths(long nativeBookmarkBridge, BookmarkBridge caller,
List<BookmarkId> folderList, List<Integer> depthList);
BookmarkId getRootFolderId(long nativeBookmarkBridge, BookmarkBridge caller);
@@ -416,7 +416,7 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
roots.Set(kBookmarkBarFolderNameKey, EncodeNode(bookmark_bar_node));
roots.Set(kOtherBookmarkFolderNameKey, EncodeNode(other_folder_node));
roots.Set(kMobileBookmarkFolderNameKey, EncodeNode(mobile_folder_node));
+ roots.SetKey(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
+ roots.Set(kTabsBookmarkFolderNameKey, EncodeNode(tabs_folder_node));
if (model_meta_info_map)
roots.Set(kMetaInfo, EncodeMetaInfo(*model_meta_info_map));
if (model_unsynced_meta_info_map) {
@@ -465,8 +465,8 @@ diff --git a/components/bookmarks/browser/bookmark_codec.cc b/components/bookmar
roots->FindDict(kOtherBookmarkFolderNameKey);
const base::Value::Dict* mobile_folder_value =
roots->FindDict(kMobileBookmarkFolderNameKey);
+ const base::Value* tabs_folder_value =
+ roots->FindDictKey(kTabsBookmarkFolderNameKey);
+ const base::Value::Dict* tabs_folder_value =
+ roots->FindDict(kTabsBookmarkFolderNameKey);
if (!bb_value || !other_folder_value || !mobile_folder_value)
return false;
build/patches/Add-option-to-not-persist-tabs-across-sessions.patch
+3 -3
View File
@@ -68,7 +68,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import org.chromium.chrome.R;
import org.chromium.chrome.browser.feedback.HelpAndFeedbackLauncherImpl;
import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -73,6 +76,8 @@ public class PrivacySettings
@@ -74,6 +77,8 @@ public class PrivacySettings
SharedPreferencesManager.getInstance();
private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
@@ -77,7 +77,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private ManagedPreferenceDelegate mManagedPreferenceDelegate;
private IncognitoLockSettings mIncognitoLockSettings;
@@ -170,7 +175,11 @@ public class PrivacySettings
@@ -171,7 +176,11 @@ public class PrivacySettings
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = preference.getKey();
@@ -90,7 +90,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(Pref.CAN_MAKE_PAYMENT_ENABLED, (boolean) newValue);
} else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
@@ -214,6 +223,11 @@ public class PrivacySettings
@@ -215,6 +224,11 @@ public class PrivacySettings
PreloadPagesSettingsFragment.getPreloadPagesSummaryString(getContext()));
}
build/patches/Bromite-auto-updater.patch
+10 -8
View File
@@ -29,9 +29,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../flags/android/chrome_feature_list.h | 1 +
.../browser/flags/ChromeFeatureList.java | 1 +
.../strings/android_chrome_strings.grd | 23 +-
.../endpoint_fetcher/endpoint_fetcher.cc | 102 +++++++-
.../endpoint_fetcher/endpoint_fetcher.h | 22 +-
23 files changed, 897 insertions(+), 53 deletions(-)
.../endpoint_fetcher/endpoint_fetcher.cc | 103 +++++++-
.../endpoint_fetcher/endpoint_fetcher.h | 23 +-
23 files changed, 899 insertions(+), 53 deletions(-)
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/BromiteInlineUpdateController.java
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateController.java
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/omaha/inline/InlineUpdateControllerFactory.java
@@ -1481,12 +1481,13 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.cc b/components/endpoi
}
void EndpointFetcher::OnResponseFetched(
@@ -327,3 +383,37 @@ void EndpointFetcher::OnSanitizationResult(
@@ -327,3 +383,38 @@ void EndpointFetcher::OnSanitizationResult(
std::string EndpointFetcher::GetUrlForTesting() {
return url_.spec();
}
+
+void EndpointFetcher::OnSimpleLoaderRedirect(
+ const GURL& url_before_redirect,
+ const net::RedirectInfo& redirect_info,
+ const network::mojom::URLResponseHead& response_head,
+ std::vector<std::string>* removed_headers) {
@@ -1555,18 +1556,19 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
// Used for tests. Can be used if caller constructs their own
// url_loader_factory and identity_manager.
EndpointFetcher(
@@ -144,6 +156,10 @@ class EndpointFetcher {
@@ -144,6 +156,11 @@ class EndpointFetcher {
void OnSanitizationResult(std::unique_ptr<EndpointResponse> response,
EndpointFetcherCallback endpoint_fetcher_callback,
data_decoder::JsonSanitizer::Result result);
+ void OnURLLoadComplete(scoped_refptr<net::HttpResponseHeaders> headers);
+ void OnSimpleLoaderRedirect(const net::RedirectInfo& redirect_info,
+ void OnSimpleLoaderRedirect(const GURL& url_before_redirect,
+ const net::RedirectInfo& redirect_info,
+ const network::mojom::URLResponseHead& response_head,
+ std::vector<std::string>* removed_headers);
enum AuthType { CHROME_API_KEY, OAUTH, NO_AUTH };
AuthType auth_type_;
@@ -151,10 +167,11 @@ class EndpointFetcher {
@@ -151,10 +168,11 @@ class EndpointFetcher {
// Members set in constructor to be passed to network::ResourceRequest or
// network::SimpleURLLoader.
const std::string oauth_consumer_name_;
@@ -1579,7 +1581,7 @@ diff --git a/components/endpoint_fetcher/endpoint_fetcher.h b/components/endpoin
const std::string post_data_;
const std::vector<std::string> headers_;
const std::vector<std::string> cors_exempt_headers_;
@@ -172,6 +189,9 @@ class EndpointFetcher {
@@ -172,6 +190,9 @@ class EndpointFetcher {
access_token_fetcher_;
std::unique_ptr<network::SimpleURLLoader> simple_url_loader_;
build/patches/Content-settings-infrastructure.patch
+3 -3
View File
@@ -726,7 +726,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
return (triStateToggle.getCheckedSetting() == ContentSettingValues.BLOCK);
case GlobalToggleLayout.FOUR_STATE_COOKIE_TOGGLE:
FourStateCookieSettingsPreference fourStateCookieToggle =
@@ -1249,6 +1265,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
@@ -1243,6 +1259,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
screen.removePreference(antiAbuseThingsToConsiderHeader);
screen.removePreference(antiAbuseThingsToConsiderSectionOne);
}
@@ -734,7 +734,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
if (mCategory.getType() == SiteSettingsCategory.Type.TIMEZONE_OVERRIDE) {
screen.removePreference(triStateToggle);
@@ -1408,7 +1425,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
@@ -1402,7 +1419,7 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
getSiteSettingsDelegate().getBrowserContextHandle(), contentType);
int[] descriptionIds =
ContentSettingsResources.getTriStateSettingDescriptionIDs(contentType);
@@ -743,7 +743,7 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
}
private void configureTimeOverrideStateToggle(
@@ -1521,6 +1538,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
@@ -1515,6 +1532,14 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
@ContentSettingValues
Integer value = site.getContentSetting(browserContextHandle, contentSettingsType);
build/patches/Disable-AGSA-by-default.patch
+5 -5
View File
@@ -21,7 +21,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -285,7 +285,6 @@ if (current_toolchain == default_toolchain) {
@@ -287,7 +287,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/first_run/android:java",
"//chrome/browser/flags:java",
"//chrome/browser/fullscreen/android:java",
@@ -29,7 +29,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/history_clusters:java",
"//chrome/browser/history_clusters:java_resources",
"//chrome/browser/image_descriptions:java",
@@ -872,7 +871,6 @@ if (current_toolchain == default_toolchain) {
@@ -874,7 +873,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/flags:flags_junit_tests",
"//chrome/browser/flags:java",
"//chrome/browser/fullscreen/android:java",
@@ -37,7 +37,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/history_clusters:java",
"//chrome/browser/image_descriptions:java",
"//chrome/browser/image_editor/public:java",
@@ -1403,7 +1401,6 @@ if (current_toolchain == default_toolchain) {
@@ -1405,7 +1403,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/first_run/android:java",
"//chrome/browser/flags:java",
"//chrome/browser/fullscreen/android:java",
@@ -275,7 +275,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/android/omnibox/BUILD.gn
--- a/chrome/browser/ui/android/omnibox/BUILD.gn
+++ b/chrome/browser/ui/android/omnibox/BUILD.gn
@@ -147,7 +147,6 @@ android_library("java") {
@@ -148,7 +148,6 @@ android_library("java") {
"//chrome/browser/device:java",
"//chrome/browser/feature_engagement:java",
"//chrome/browser/flags:java",
@@ -283,7 +283,7 @@ diff --git a/chrome/browser/ui/android/omnibox/BUILD.gn b/chrome/browser/ui/andr
"//chrome/browser/history_clusters:java",
"//chrome/browser/language/android:java",
"//chrome/browser/lens:java",
@@ -444,7 +443,6 @@ robolectric_library("junit") {
@@ -445,7 +444,6 @@ robolectric_library("junit") {
"//chrome/android:base_module_java",
"//chrome/browser/device:java",
"//chrome/browser/flags:java",
build/patches/Disable-FLoC-and-privacy-sandbox.patch
+3 -3
View File
@@ -37,7 +37,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -63,8 +63,6 @@ public class PrivacySettings
@@ -64,8 +64,6 @@ public class PrivacySettings
private static final String PREF_SECURE_DNS = "secure_dns";
private static final String PREF_DO_NOT_TRACK = "do_not_track";
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
@@ -46,7 +46,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
private static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
@@ -97,19 +95,6 @@ public class PrivacySettings
@@ -98,19 +96,6 @@ public class PrivacySettings
SettingsUtils.addPreferencesFromResource(this, R.xml.privacy_preferences);
}
@@ -66,7 +66,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
Preference privacyGuidePreference = findPreference(PREF_PRIVACY_GUIDE);
// Record the launch of PG from the S&P link-row entry point
privacyGuidePreference.setOnPreferenceClickListener(preference -> {
@@ -258,13 +243,6 @@ public class PrivacySettings
@@ -259,13 +244,6 @@ public class PrivacySettings
secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext()));
}
build/patches/Disable-safe-browsing.patch
+191 -8
View File
@@ -57,15 +57,19 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../PrivacyGuidePagerAdapter.java | 2 -
.../privacy_guide/PrivacyGuideUtils.java | 6 +-
.../privacy_guide/StepDisplayHandlerImpl.java | 2 +-
...hrome_browser_main_extra_parts_profiles.cc | 4 +-
...hrome_browser_main_extra_parts_profiles.cc | 10 +-
chrome/browser/profiles/profile_impl.cc | 4 +-
chrome/browser/safe_browsing/BUILD.gn | 4 +-
chrome/browser/safe_browsing/android/BUILD.gn | 4 -
chrome/browser/safe_browsing/android/BUILD.gn | 5 -
.../safe_browsing/SafeBrowsingBridge.java | 91 -------------------
.../android/safe_browsing_bridge.cc | 59 ------------
.../download_protection_service.cc | 2 +
.../download_protection_service.h | 3 +-
.../url_lookup_service_factory.cc | 4 +
.../ssl/generated_https_first_mode_pref.cc | 26 +-----
.../ssl/generated_https_first_mode_pref.h | 12 +--
.../ssl/https_first_mode_settings_tracker.cc | 16 ----
.../ssl/https_first_mode_settings_tracker.h | 10 +-
.../ssl/sct_reporting_service_factory.cc | 11 +--
.../browser/ssl/security_state_tab_helper.cc | 9 +-
...urce_filter_web_contents_helper_factory.cc | 4 +
@@ -77,7 +81,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
chrome/renderer/BUILD.gn | 5 -
.../chrome_content_renderer_client.cc | 6 +-
.../renderer/chrome_content_renderer_client.h | 3 -
chrome/test/BUILD.gn | 3 -
chrome/test/BUILD.gn | 5 -
components/BUILD.gn | 1 -
.../installer_policies/BUILD.gn | 2 -
.../permissions/permission_request_manager.cc | 5 +-
@@ -94,7 +98,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../file_system_access_permission_context.h | 6 --
weblayer/BUILD.gn | 4 -
weblayer/test/BUILD.gn | 1 -
85 files changed, 209 insertions(+), 680 deletions(-)
89 files changed, 213 insertions(+), 749 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
@@ -2093,7 +2097,20 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#endif
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
ChildAccountServiceFactory::GetInstance();
@@ -884,7 +882,9 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -830,12 +828,6 @@ void ChromeBrowserMainExtraPartsProfiles::
safe_browsing::ExtensionTelemetryServiceFactory::GetInstance();
safe_browsing::HashRealTimeServiceFactory::GetInstance();
#endif
- safe_browsing::ChromePasswordProtectionServiceFactory::GetInstance();
- safe_browsing::ClientSideDetectionServiceFactory::GetInstance();
- safe_browsing::RealTimeUrlLookupServiceFactory::GetInstance();
- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetInstance();
- safe_browsing::SafeBrowsingNavigationObserverManagerFactory::GetInstance();
- safe_browsing::VerdictCacheManagerFactory::GetInstance();
#if BUILDFLAG(IS_MAC)
if (screentime::IsScreenTimeEnabled()) {
screentime::HistoryBridgeFactory::GetInstance();
@@ -884,7 +876,9 @@ void ChromeBrowserMainExtraPartsProfiles::
}
#endif
TabRestoreServiceFactory::GetInstance();
@@ -2169,7 +2186,15 @@ 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
@@ -41,12 +41,8 @@ source_set("android") {
@@ -17,7 +17,6 @@ source_set("android") {
deps = [
":jni_headers",
"//chrome/browser/profiles:profile",
- "//chrome/browser/safe_browsing:advanced_protection",
"//components/password_manager/core/browser/leak_detection",
"//components/password_manager/core/common",
"//components/prefs",
@@ -41,12 +40,8 @@ source_set("android") {
android_library("java") {
sources = [
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java",
@@ -2413,6 +2438,155 @@ diff --git a/chrome/browser/safe_browsing/url_lookup_service_factory.cc b/chrome
}
} // namespace safe_browsing
diff --git a/chrome/browser/ssl/generated_https_first_mode_pref.cc b/chrome/browser/ssl/generated_https_first_mode_pref.cc
--- a/chrome/browser/ssl/generated_https_first_mode_pref.cc
+++ b/chrome/browser/ssl/generated_https_first_mode_pref.cc
@@ -27,20 +27,6 @@ GeneratedHttpsFirstModePref::GeneratedHttpsFirstModePref(Profile* profile)
base::BindRepeating(
&GeneratedHttpsFirstModePref::OnSourcePreferencesChanged,
base::Unretained(this)));
-
- // Track Advanced Protection status.
- if (base::FeatureList::IsEnabled(
- features::kHttpsFirstModeForAdvancedProtectionUsers)) {
- obs_.Observe(
- safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile(
- profile_));
- // On startup, AdvancedProtectionStatusManager runs before this class so we
- // don't get called back. Run the callback to get the AP setting.
- OnAdvancedProtectionStatusChanged(
- safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile(
- profile_)
- ->IsUnderAdvancedProtection());
- }
}
GeneratedHttpsFirstModePref::~GeneratedHttpsFirstModePref() = default;
@@ -49,13 +35,6 @@ void GeneratedHttpsFirstModePref::OnSourcePreferencesChanged() {
NotifyObservers(kGeneratedHttpsFirstModePref);
}
-void GeneratedHttpsFirstModePref::OnAdvancedProtectionStatusChanged(
- bool enabled) {
- DCHECK(base::FeatureList::IsEnabled(
- features::kHttpsFirstModeForAdvancedProtectionUsers));
- NotifyObservers(kGeneratedHttpsFirstModePref);
-}
-
extensions::settings_private::SetPrefResult
GeneratedHttpsFirstModePref::SetPref(const base::Value* value) {
if (!value->is_bool()) {
@@ -74,10 +53,7 @@ GeneratedHttpsFirstModePref::SetPref(const base::Value* value) {
}
settings_api::PrefObject GeneratedHttpsFirstModePref::GetPrefObject() const {
- bool is_advanced_protection_enabled =
- safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile(
- profile_)
- ->IsUnderAdvancedProtection();
+ bool is_advanced_protection_enabled = false;
auto* backing_preference =
profile_->GetPrefs()->FindPreference(prefs::kHttpsOnlyModeEnabled);
diff --git a/chrome/browser/ssl/generated_https_first_mode_pref.h b/chrome/browser/ssl/generated_https_first_mode_pref.h
--- a/chrome/browser/ssl/generated_https_first_mode_pref.h
+++ b/chrome/browser/ssl/generated_https_first_mode_pref.h
@@ -18,9 +18,7 @@
extern const char kGeneratedHttpsFirstModePref[];
class GeneratedHttpsFirstModePref
- : public extensions::settings_private::GeneratedPref,
- public safe_browsing::AdvancedProtectionStatusManager::
- StatusChangedObserver {
+ : public extensions::settings_private::GeneratedPref {
public:
explicit GeneratedHttpsFirstModePref(Profile* profile);
~GeneratedHttpsFirstModePref() override;
@@ -33,18 +31,10 @@ class GeneratedHttpsFirstModePref
// Fired when preferences used to generate this preference are changed.
void OnSourcePreferencesChanged();
- // safe_browsing::AdvancedProtectionStatusManager::StatusChangedObserver:
- void OnAdvancedProtectionStatusChanged(bool enabled) override;
-
private:
// Non-owning pointer to the profile this preference is generated for.
const raw_ptr<Profile> profile_;
PrefChangeRegistrar user_prefs_registrar_;
-
- base::ScopedObservation<
- safe_browsing::AdvancedProtectionStatusManager,
- safe_browsing::AdvancedProtectionStatusManager::StatusChangedObserver>
- obs_{this};
};
#endif // CHROME_BROWSER_SSL_GENERATED_HTTPS_FIRST_MODE_PREF_H_
diff --git a/chrome/browser/ssl/https_first_mode_settings_tracker.cc b/chrome/browser/ssl/https_first_mode_settings_tracker.cc
--- a/chrome/browser/ssl/https_first_mode_settings_tracker.cc
+++ b/chrome/browser/ssl/https_first_mode_settings_tracker.cc
@@ -38,20 +38,6 @@ HttpsFirstModeService::HttpsFirstModeService(Profile* profile)
base::BindRepeating(&HttpsFirstModeService::OnHttpsFirstModePrefChanged,
base::Unretained(this)));
- // Track Advanced Protection status.
- if (base::FeatureList::IsEnabled(
- features::kHttpsFirstModeForAdvancedProtectionUsers)) {
- obs_.Observe(
- safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile(
- profile_));
- // On startup, AdvancedProtectionStatusManager runs before this class so we
- // don't get called back. Run the callback to get the AP setting.
- OnAdvancedProtectionStatusChanged(
- safe_browsing::AdvancedProtectionStatusManagerFactory::GetForProfile(
- profile_)
- ->IsUnderAdvancedProtection());
- }
-
// Make sure the pref state is logged and the synthetic field trial state is
// created at startup (as the pref may never change over the session).
bool enabled = profile_->GetPrefs()->GetBoolean(prefs::kHttpsOnlyModeEnabled);
@@ -106,8 +92,6 @@ HttpsFirstModeServiceFactory::HttpsFirstModeServiceFactory()
// Incognito (which uses the settings of the main profile) and Guest
// Mode.
ProfileSelections::BuildForRegularProfile()) {
- DependsOn(
- safe_browsing::AdvancedProtectionStatusManagerFactory::GetInstance());
}
HttpsFirstModeServiceFactory::~HttpsFirstModeServiceFactory() = default;
diff --git a/chrome/browser/ssl/https_first_mode_settings_tracker.h b/chrome/browser/ssl/https_first_mode_settings_tracker.h
--- a/chrome/browser/ssl/https_first_mode_settings_tracker.h
+++ b/chrome/browser/ssl/https_first_mode_settings_tracker.h
@@ -21,9 +21,7 @@ class Profile;
// field trial based on that state.
// - Changing the pref based on user's Advanced Protection status.
class HttpsFirstModeService
- : public KeyedService,
- public safe_browsing::AdvancedProtectionStatusManager::
- StatusChangedObserver {
+ : public KeyedService {
public:
explicit HttpsFirstModeService(Profile* profile);
~HttpsFirstModeService() override;
@@ -32,17 +30,13 @@ class HttpsFirstModeService
HttpsFirstModeService& operator=(const HttpsFirstModeService&) = delete;
// safe_browsing::AdvancedProtectionStatusManager::StatusChangedObserver:
- void OnAdvancedProtectionStatusChanged(bool enabled) override;
+ void OnAdvancedProtectionStatusChanged(bool enabled);
private:
void OnHttpsFirstModePrefChanged();
raw_ptr<Profile> profile_;
PrefChangeRegistrar pref_change_registrar_;
- base::ScopedObservation<
- safe_browsing::AdvancedProtectionStatusManager,
- safe_browsing::AdvancedProtectionStatusManager::StatusChangedObserver>
- obs_{this};
};
// Factory boilerplate for creating the `HttpsFirstModeService` for each browser
diff --git a/chrome/browser/ssl/sct_reporting_service_factory.cc b/chrome/browser/ssl/sct_reporting_service_factory.cc
--- a/chrome/browser/ssl/sct_reporting_service_factory.cc
+++ b/chrome/browser/ssl/sct_reporting_service_factory.cc
@@ -2755,7 +2929,16 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/safe_browsing/content/common:interfaces",
"//components/safe_browsing/content/renderer/phishing_classifier:phishing_classifier",
"//components/safe_browsing/core/common/fbs:client_model",
@@ -1466,7 +1465,6 @@ if (!is_android) {
@@ -1322,8 +1321,6 @@ if (!is_android) {
"//chrome/browser/profiling_host:profiling_browsertests",
"//chrome/browser/resource_coordinator:mojo_bindings",
"//chrome/browser/resource_coordinator:tab_manager_features",
- "//chrome/browser/safe_browsing:advanced_protection",
- "//chrome/browser/safe_browsing:verdict_cache_manager_factory",
"//chrome/browser/segmentation_platform:test_utils",
"//chrome/browser/sharing/proto",
"//chrome/browser/storage_access_api:permissions",
@@ -1466,7 +1463,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -2763,7 +2946,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -6082,7 +6080,6 @@ test("unit_tests") {
@@ -6082,7 +6078,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
build/patches/Disable-safety-check.patch
+4 -4
View File
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -320,7 +320,6 @@ if (current_toolchain == default_toolchain) {
@@ -322,7 +322,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/profiles/android:java",
"//chrome/browser/quick_delete:java",
"//chrome/browser/safe_browsing/android:java",
@@ -21,7 +21,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/search_engines/android:java",
"//chrome/browser/search_resumption:java",
"//chrome/browser/segmentation_platform:factory_java",
@@ -902,8 +901,6 @@ if (current_toolchain == default_toolchain) {
@@ -904,8 +903,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/privacy_guide/android:java",
"//chrome/browser/privacy_guide/android:junit",
"//chrome/browser/profiles/android:java",
@@ -30,7 +30,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//chrome/browser/search_engines/android:java",
"//chrome/browser/search_resumption:junit",
"//chrome/browser/segmentation_platform:factory_java",
@@ -1442,8 +1439,6 @@ if (current_toolchain == default_toolchain) {
@@ -1444,8 +1441,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/profiles/android:java",
"//chrome/browser/safe_browsing/android:java",
"//chrome/browser/safe_browsing/android:javatests",
@@ -85,7 +85,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Omn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3297,7 +3297,6 @@ static_library("browser") {
@@ -3299,7 +3299,6 @@ static_library("browser") {
"//chrome/browser/privacy_sandbox/android:jni_headers",
"//chrome/browser/reading_list/android",
"//chrome/browser/safe_browsing/android:safe_browsing_enums",
build/patches/Enable-native-Android-autofill.patch
+60 -7
View File
@@ -24,19 +24,22 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
chrome/browser/android/tab_android.cc | 23 ++++++
chrome/browser/android/tab_android.h | 2 +
.../tab_web_contents_delegate_android.cc | 3 +-
.../browser/extensions/extension_view_host.cc | 3 +-
.../strings/android_chrome_strings.grd | 6 ++
chrome/browser/ui/tab_helpers.cc | 6 +-
.../presentation_receiver_window_view.cc | 3 +-
.../browser/android_autofill_manager.cc | 2 +-
.../browser/android_autofill_manager.h | 4 +-
.../browser/content_autofill_driver.cc | 30 +++++++
.../content/browser/content_autofill_driver.h | 9 ++-
.../content_autofill_driver_factory.cc | 4 +
.../content_autofill_driver_factory.cc | 11 ++-
.../browser/content_autofill_driver_factory.h | 1 +
.../renderer/password_autofill_agent.cc | 5 +-
.../autofill/core/common/autofill_prefs.cc | 6 ++
.../autofill/core/common/autofill_prefs.h | 2 +
.../embedder_support/view/ContentView.java | 46 +++++++++++
.../chromium/ui/base/ViewAndroidDelegate.java | 8 ++
21 files changed, 302 insertions(+), 7 deletions(-)
24 files changed, 314 insertions(+), 12 deletions(-)
diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc
--- a/android_webview/browser/aw_contents.cc
@@ -54,7 +57,7 @@ diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -338,6 +338,7 @@ if (current_toolchain == default_toolchain) {
@@ -340,6 +340,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/ui/android/favicon:java",
"//chrome/browser/ui/android/layouts:java",
"//chrome/browser/ui/android/layouts/glue:java",
@@ -392,6 +395,19 @@ diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrom
ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
portal_contents,
autofill::ChromeAutofillClient::FromWebContents(portal_contents));
diff --git a/chrome/browser/extensions/extension_view_host.cc b/chrome/browser/extensions/extension_view_host.cc
--- a/chrome/browser/extensions/extension_view_host.cc
+++ b/chrome/browser/extensions/extension_view_host.cc
@@ -59,7 +59,8 @@ ExtensionViewHost::ExtensionViewHost(const Extension* extension,
base::BindRepeating(
&autofill::BrowserDriverInitHook,
autofill::ChromeAutofillClient::FromWebContents(host_contents()),
- g_browser_process->GetApplicationLocale()));
+ g_browser_process->GetApplicationLocale(),
+ /*enable_secondary_autofill_manager*/ false));
// The popup itself cannot be zoomed, but we must specify a zoom level to use.
// Otherwise, if a user zooms a page of the same extension, the popup would
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
@@ -431,6 +447,19 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
if (breadcrumbs::IsEnabled())
BreadcrumbManagerTabHelper::CreateForWebContents(web_contents);
chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents);
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
--- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
+++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
@@ -174,7 +174,8 @@ void PresentationReceiverWindowView::Init() {
base::BindRepeating(
&autofill::BrowserDriverInitHook,
autofill::ChromeAutofillClient::FromWebContents(web_contents),
- g_browser_process->GetApplicationLocale()));
+ g_browser_process->GetApplicationLocale(),
+ /*enable_secondary_autofill_manager*/ false));
ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
web_contents,
autofill::ChromeAutofillClient::FromWebContents(web_contents));
diff --git a/components/android_autofill/browser/android_autofill_manager.cc b/components/android_autofill/browser/android_autofill_manager.cc
--- a/components/android_autofill/browser/android_autofill_manager.cc
+++ b/components/android_autofill/browser/android_autofill_manager.cc
@@ -443,6 +472,24 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.cc b/c
driver->GetAutofillAgent()->SetUserGestureRequired(false);
driver->GetAutofillAgent()->SetSecureContextRequired(true);
driver->GetAutofillAgent()->SetFocusRequiresScroll(false);
diff --git a/components/android_autofill/browser/android_autofill_manager.h b/components/android_autofill/browser/android_autofill_manager.h
--- a/components/android_autofill/browser/android_autofill_manager.h
+++ b/components/android_autofill/browser/android_autofill_manager.h
@@ -84,12 +84,12 @@ class AndroidAutofillManager : public AutofillManager {
const FieldTypeGroup field_type_group,
const url::Origin& triggered_origin);
+ AndroidAutofillManager(AutofillDriver* driver, AutofillClient* client);
+
protected:
friend void AndroidDriverInitHook(AutofillClient* client,
ContentAutofillDriver* driver);
- AndroidAutofillManager(AutofillDriver* driver, AutofillClient* client);
-
void OnFormSubmittedImpl(const FormData& form,
bool known_success,
mojom::SubmissionSource source) override;
diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc
--- a/components/autofill/content/browser/content_autofill_driver.cc
+++ b/components/autofill/content/browser/content_autofill_driver.cc
@@ -613,16 +660,22 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory
#include "content/public/browser/global_routing_id.h"
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/render_frame_host.h"
@@ -42,9 +43,12 @@ bool ShouldEnableHeavyFormDataScraping(const version_info::Channel channel) {
@@ -42,9 +43,17 @@ bool ShouldEnableHeavyFormDataScraping(const version_info::Channel channel) {
void BrowserDriverInitHook(AutofillClient* client,
const std::string& app_locale,
+ bool enable_secondary_autofill_manager,
ContentAutofillDriver* driver) {
+#if BUILDFLAG(IS_ANDROID)
driver->set_autofill_manager(
std::make_unique<BrowserAutofillManager>(driver, client, app_locale));
+ enable_secondary_autofill_manager == false ? nullptr :
+ base::WrapUnique(new AndroidAutofillManager(driver, client)));
- std::make_unique<BrowserAutofillManager>(driver, client, app_locale));
+ std::make_unique<BrowserAutofillManager>(driver, client, app_locale),
+ enable_secondary_autofill_manager == false ? nullptr :
+ base::WrapUnique(new AndroidAutofillManager(driver, client)));
+#else
+ driver->set_autofill_manager(std::make_unique<BrowserAutofillManager>(
+ driver, client, app_locale), nullptr);
+#endif
if (client && ShouldEnableHeavyFormDataScraping(client->GetChannel()))
driver->GetAutofillAgent()->EnableHeavyFormDataScraping();
}
build/patches/Experimental-user-scripts-support.patch
+4 -4
View File
@@ -235,7 +235,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
}
if (enable_vr) {
@@ -483,6 +486,7 @@ if (current_toolchain == default_toolchain) {
@@ -485,6 +488,7 @@ if (current_toolchain == default_toolchain) {
"//components/ukm/android:java",
"//components/url_formatter/android:url_formatter_java",
"//components/user_prefs/android:java",
@@ -321,7 +321,7 @@ diff --git a/chrome/android/java_sources.gni b/chrome/android/java_sources.gni
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3455,6 +3455,11 @@ static_library("browser") {
@@ -3457,6 +3457,11 @@ static_library("browser") {
]
deps += [ "//chrome/android/modules/dev_ui/provider:native" ]
}
@@ -416,7 +416,7 @@ diff --git a/chrome/browser/profiles/BUILD.gn b/chrome/browser/profiles/BUILD.gn
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -393,6 +393,8 @@
@@ -395,6 +395,8 @@
#include "chrome/browser/user_notes/user_note_service_factory.h"
#endif
@@ -425,7 +425,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
namespace chrome {
void AddProfilesExtraParts(ChromeBrowserMainParts* main_parts) {
@@ -920,6 +922,7 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -912,6 +914,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
WebDataServiceFactory::GetInstance();
webrtc_event_logging::WebRtcEventLogManagerKeyedServiceFactory::GetInstance();
build/patches/History-number-of-days-privacy-setting.patch
+5 -5
View File
@@ -57,9 +57,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import org.chromium.components.browser_ui.settings.SettingsLauncher;
import org.chromium.components.browser_ui.settings.SettingsUtils;
import org.chromium.components.browser_ui.site_settings.ContentSettingsResources;
@@ -52,6 +53,9 @@ import androidx.preference.PreferenceCategory;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
@@ -53,6 +54,9 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
+import java.util.ArrayList;
+import java.util.List;
@@ -67,7 +67,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
/**
* Fragment to keep track of the all the privacy related preferences.
*/
@@ -83,6 +87,8 @@ public class PrivacySettings
@@ -84,6 +88,8 @@ public class PrivacySettings
private ChromeSwitchPreference allowCustomTabIntentsPref;
private ChromeSwitchPreference openExternalLinksPref;
@@ -76,7 +76,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
PrivacyPreferencesManagerImpl privacyPrefManager =
@@ -150,6 +156,40 @@ public class PrivacySettings
@@ -151,6 +157,40 @@ public class PrivacySettings
Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled());
@@ -117,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
Preference thirdPartyCookies = findPreference(PREF_THIRD_PARTY_COOKIES);
if (thirdPartyCookies != null) {
thirdPartyCookies.getExtras().putString(
@@ -252,6 +292,29 @@ public class PrivacySettings
@@ -253,6 +293,29 @@ public class PrivacySettings
}
}
build/patches/JIT-site-settings.patch
+2 -11
View File
@@ -20,7 +20,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../permission_javascript_jit.png | Bin 0 -> 797 bytes
.../res/xml/site_settings_preferences.xml | 4 ++++
.../ContentSettingsResources.java | 7 ++++++
.../site_settings/SingleCategorySettings.java | 11 +++++++++
.../site_settings/SingleCategorySettings.java | 9 ++++++++
.../site_settings/SingleWebsiteSettings.java | 21 ++++++++++++++++++
.../site_settings/SiteSettingsCategory.java | 9 ++++++--
.../site_settings/SiteSettingsUtil.java | 1 +
@@ -32,7 +32,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
components/page_info/page_info.cc | 6 +++++
components/page_info/page_info_ui.cc | 2 ++
components/site_settings_strings.grdp | 6 +++++
20 files changed, 99 insertions(+), 3 deletions(-)
20 files changed, 97 insertions(+), 3 deletions(-)
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-hdpi/permission_javascript_jit.png
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-mdpi/permission_javascript_jit.png
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xhdpi/permission_javascript_jit.png
@@ -237,15 +237,6 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
default:
break;
}
@@ -1201,6 +1210,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
infoText.setSummary(R.string.website_settings_cookie_info);
} else if (mCategory.getType() == SiteSettingsCategory.Type.AUTOPLAY) {
allowSpecifyingExceptions = true;
+ } else if (mCategory.getType() == SiteSettingsCategory.Type.JAVASCRIPT_JIT) {
+ allowSpecifyingExceptions = true;
} else if (mCategory.getType() == SiteSettingsCategory.Type.SITE_DATA) {
infoText.setSummary(R.string.website_settings_site_data_page_description);
} else if (mCategory.getType() == SiteSettingsCategory.Type.THIRD_PARTY_COOKIES) {
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
build/patches/Move-navigation-bar-to-bottom.patch
+2 -2
View File
@@ -152,7 +152,7 @@ diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -100,6 +100,9 @@ import org.chromium.ui.util.ColorUtils;
@@ -99,6 +99,9 @@ import org.chromium.ui.util.ColorUtils;
import java.util.List;
@@ -162,7 +162,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
/** The mediator implements the logic to interact with the surfaces and caller. */
class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.OnClickListener,
StartSurface.OnTabSelectingListener, BackPressHandler,
@@ -1249,6 +1252,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -1241,6 +1244,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
}
private void setTopMargin(int topMargin) {
build/patches/Move-some-account-settings-back-to-privacy-settings.patch
+10 -9
View File
@@ -7,9 +7,9 @@ Search suggestions, autofill assistant and contextual search
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../java/res/xml/privacy_preferences.xml | 13 ++++++++
.../privacy/settings/PrivacySettings.java | 32 ++++++++++++++++++-
.../privacy/settings/PrivacySettings.java | 33 ++++++++++++++++++-
.../strings/android_chrome_strings.grd | 4 +++
3 files changed, 48 insertions(+), 1 deletion(-)
3 files changed, 49 insertions(+), 1 deletion(-)
diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/android/java/res/xml/privacy_preferences.xml
--- a/chrome/android/java/res/xml/privacy_preferences.xml
@@ -23,8 +23,8 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
+ android:title="@string/services_category_title">
+ <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+ android:key="search_suggestions"
+ android:title="@string/autocomplete_searches_and_urls_title"
+ android:summary="@string/autocomplete_searches_and_urls_summary"
+ android:title="@string/improve_search_suggestions_title"
+ android:summary="@string/improve_search_suggestions_summary"
+ android:persistent="false"/>
+ <org.chromium.components.browser_ui.settings.ChromeBasePreference
+ android:key="contextual_search"
@@ -37,7 +37,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -44,6 +44,12 @@ import org.chromium.components.user_prefs.UserPrefs;
@@ -44,6 +44,13 @@ import org.chromium.components.user_prefs.UserPrefs;
import org.chromium.ui.text.NoUnderlineClickableSpan;
import org.chromium.ui.text.SpanApplier;
@@ -46,11 +46,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
+import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
+import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
+import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
+import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
+
/**
* Fragment to keep track of the all the privacy related preferences.
*/
@@ -60,6 +66,17 @@ public class PrivacySettings
@@ -60,6 +67,17 @@ public class PrivacySettings
private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
private static final String PREF_THIRD_PARTY_COOKIES = "third_party_cookies";
@@ -68,7 +69,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private IncognitoLockSettings mIncognitoLockSettings;
@Override
@@ -107,6 +124,16 @@ public class PrivacySettings
@@ -107,6 +125,16 @@ public class PrivacySettings
setHasOptionsMenu(true);
@@ -85,7 +86,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
ChromeSwitchPreference canMakePaymentPref =
(ChromeSwitchPreference) findPreference(PREF_CAN_MAKE_PAYMENT);
canMakePaymentPref.setOnPreferenceChangeListener(this);
@@ -158,6 +185,9 @@ public class PrivacySettings
@@ -158,6 +186,9 @@ public class PrivacySettings
} else if (PREF_HTTPS_FIRST_MODE.equals(key)) {
UserPrefs.get(Profile.getLastUsedRegularProfile())
.setBoolean(Pref.HTTPS_ONLY_MODE_ENABLED, (boolean) newValue);
@@ -95,7 +96,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
}
return true;
}
@@ -172,7 +202,7 @@ public class PrivacySettings
@@ -172,7 +203,7 @@ public class PrivacySettings
* Updates the preferences.
*/
public void updatePreferences() {
build/patches/Remove-HTTP-referrals-in-cross-origin-navigation.patch
+2 -2
View File
@@ -172,7 +172,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings;
import org.chromium.chrome.browser.privacy_guide.PrivacyGuideInteractions;
import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxBridge;
@@ -66,6 +67,7 @@ public class PrivacySettings
@@ -67,6 +68,7 @@ public class PrivacySettings
private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
private static final String PREF_SECURE_DNS = "secure_dns";
private static final String PREF_DO_NOT_TRACK = "do_not_track";
@@ -180,7 +180,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
private static final String PREF_PRIVACY_GUIDE = "privacy_guide";
private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
@@ -267,6 +269,10 @@ public class PrivacySettings
@@ -268,6 +270,10 @@ public class PrivacySettings
: R.string.text_off);
}
build/patches/Remove-binary-blob-integrations.patch
+23 -9
View File
@@ -72,7 +72,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../components/media_router/MediaSink.java | 44 +-
.../media_router/MediaStatusBridge.java | 40 +-
.../caf/BaseNotificationController.java | 48 --
.../caf/BaseSessionController.java | 100 +---
.../caf/BaseSessionController.java | 100 +--
.../caf/CafBaseMediaRouteProvider.java | 103 +---
.../caf/CafMediaRouteProvider.java | 16 -
.../media_router/caf/CafMessageHandler.java | 97 +--
@@ -101,11 +101,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
services/BUILD.gn | 9 -
services/device/geolocation/BUILD.gn | 4 -
services/shape_detection/BUILD.gn | 2 -
third_party/android_deps/BUILD.gn | 559 +-----------------
third_party/android_deps/BUILD.gn | 567 +-----------------
.../preconditions/javatests/BUILD.gn | 1 -
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
weblayer/browser/java/BUILD.gn | 1 -
81 files changed, 96 insertions(+), 1955 deletions(-)
81 files changed, 96 insertions(+), 1963 deletions(-)
diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
--- a/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
@@ -401,7 +401,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -58,9 +58,4 @@ found in the LICENSE file.
android:summary="@string/autocomplete_searches_and_urls_summary"
android:summary="@string/improve_search_suggestions_summary"
android:persistent="false"/>
</PreferenceCategory>
- <Preference
@@ -3439,7 +3439,7 @@ diff --git a/services/shape_detection/BUILD.gn b/services/shape_detection/BUILD.
diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.gn
--- a/third_party/android_deps/BUILD.gn
+++ b/third_party/android_deps/BUILD.gn
@@ -75,7 +75,7 @@ if (!limit_android_deps) {
@@ -75,21 +75,13 @@ if (!limit_android_deps) {
android_library("chromium_play_services_availability_java") {
sources = [ "util/org/chromium/gms/ChromiumPlayServicesAvailability.java" ]
@@ -3448,7 +3448,21 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
}
robolectric_library("chromium_play_services_availability_shadows_java") {
@@ -954,210 +954,6 @@ if (!limit_android_deps) {
sources = [ "util/org/chromium/gms/shadows/ShadowChromiumPlayServicesAvailability.java" ]
deps = [ ":chromium_play_services_availability_java" ]
}
-
- java_group("playcore_java") {
- if (defined(playcore_target)) {
- deps = [ playcore_target ]
- } else {
- deps = [ "//third_party/android_deps:com_google_android_play_feature_delivery_java" ]
- }
- }
}
# TODO(crbug.com/1366370) Remove this once all depencencies are updated to
@@ -954,210 +946,6 @@ if (!limit_android_deps) {
]
}
@@ -3659,7 +3673,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_google_android_material_material_java") {
aar_path =
@@ -1203,64 +999,6 @@ if (!limit_android_deps) {
@@ -1203,64 +991,6 @@ if (!limit_android_deps) {
]
}
@@ -3724,7 +3738,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("com_google_guava_guava_android_java") {
jar_path = "libs/com_google_guava_guava_android/guava-31.1-android.jar"
@@ -1519,19 +1257,6 @@ if (!limit_android_deps) {
@@ -1519,19 +1249,6 @@ if (!limit_android_deps) {
is_robolectric = true
}
@@ -3744,7 +3758,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("org_robolectric_utils_java") {
jar_path = "libs/org_robolectric_utils/utils-4.8.1.jar"
@@ -1892,288 +1617,6 @@ if (!limit_android_deps) {
@@ -1892,288 +1609,6 @@ if (!limit_android_deps) {
deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
build/patches/Remove-contextual-search-manager.patch
+6 -6
View File
@@ -473,7 +473,7 @@ deleted file mode 100644
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
+++ b/chrome/android/java/res/xml/google_services_preferences.xml
@@ -41,12 +41,4 @@ found in the LICENSE file.
@@ -38,12 +38,4 @@ found in the LICENSE file.
android:summary="@string/prefs_autofill_assistant_summary"
android:fragment="org.chromium.chrome.browser.autofill_assistant.AutofillAssistantPreferenceFragment"
app:isPreferenceVisible="false"/>
@@ -490,8 +490,8 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
--- a/chrome/android/java/res/xml/privacy_preferences.xml
+++ b/chrome/android/java/res/xml/privacy_preferences.xml
@@ -57,10 +57,6 @@ found in the LICENSE file.
android:title="@string/autocomplete_searches_and_urls_title"
android:summary="@string/autocomplete_searches_and_urls_summary"
android:title="@string/improve_search_suggestions_title"
android:summary="@string/improve_search_suggestions_summary"
android:persistent="false"/>
- <org.chromium.components.browser_ui.settings.ChromeBasePreference
- android:key="contextual_search"
@@ -856,8 +856,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
-import org.chromium.chrome.browser.contextualsearch.ContextualSearchManager;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
@@ -69,9 +68,7 @@ public class PrivacySettings
import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
@@ -70,9 +69,7 @@ public class PrivacySettings
// moved from SyncAndServicesSettings.java
private static final String PREF_SERVICES_CATEGORY = "services_category";
private static final String PREF_SEARCH_SUGGESTIONS = "search_suggestions";
@@ -867,7 +867,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private final SharedPreferencesManager mSharedPreferencesManager =
SharedPreferencesManager.getInstance();
private final PrefService prefService = UserPrefs.get(Profile.getLastUsedRegularProfile());
@@ -128,12 +125,6 @@ public class PrivacySettings
@@ -129,12 +126,6 @@ public class PrivacySettings
mSearchSuggestions.setOnPreferenceChangeListener(this);
mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
build/patches/Remove-price-shopping-commerce-integrations.patch
+1022 -56
View File
File diff suppressed because it is too large Load Diff
build/patches/Remove-signin-and-sync-integrations.patch
+235 -47
View File
@@ -25,7 +25,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../browser/feed/FeedSurfaceCoordinator.java | 9 +-
.../browser/feed/FeedSurfaceMediator.java | 76 +-----
chrome/android/java/AndroidManifest.xml | 19 --
.../res/xml/google_services_preferences.xml | 7 -
.../res/xml/google_services_preferences.xml | 10 -
.../android/java/res/xml/main_preferences.xml | 22 +-
.../java/res/xml/manage_sync_preferences.xml | 12 -
.../java/res/xml/privacy_preferences.xml | 4 -
@@ -36,8 +36,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../chrome/browser/ChromeTabbedActivity.java | 9 -
.../chrome/browser/app/ChromeActivity.java | 75 ------
.../app/feed/FeedActionDelegateImpl.java | 3 -
.../autofill/settings/AddressEditor.java | 16 +-
.../AutofillAssistantPreferenceFragment.java | 1 -
.../bookmarks/BookmarkItemsAdapter.java | 54 +----
.../bookmarks/BookmarkItemsAdapter.java | 55 +----
.../bookmarks/BookmarkPromoHeader.java | 227 +-----------------
.../ClearBrowsingDataFragment.java | 77 ------
.../ClearBrowsingDataFragmentBasic.java | 27 +--
@@ -47,7 +48,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../firstrun/LightweightFirstRunActivity.java | 4 +-
...FirstRunFragmentWithEnterpriseSupport.java | 6 -
.../history/HistoryContentManager.java | 25 +-
.../identity_disc/IdentityDiscController.java | 104 +-------
.../identity_disc/IdentityDiscController.java | 130 +---------
.../init/ChromeBrowserInitializer.java | 2 -
.../init/ProcessInitializationHandler.java | 9 -
.../chrome/browser/ntp/RecentTabsManager.java | 129 +---------
@@ -60,7 +61,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../settings/PasswordSettings.java | 71 +-----
.../browser/payments/ui/PaymentRequestUI.java | 12 +-
.../privacy/settings/PrivacySettings.java | 31 ---
.../chrome/browser/settings/MainSettings.java | 97 +-------
.../chrome/browser/settings/MainSettings.java | 96 +-------
.../browser/settings/SettingsActivity.java | 9 -
.../share/crow/CrowButtonDelegateImpl.java | 5 +-
.../survey/ChromeSurveyController.java | 4 +-
@@ -89,6 +90,8 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
chrome/browser/privacy_guide/android/BUILD.gn | 2 -
.../res/layout/privacy_guide_msbb_step.xml | 8 -
.../browser/privacy_guide/MSBBFragment.java | 9 -
.../privacy_guide/PrivacyGuideUtils.java | 5 +-
...hrome_browser_main_extra_parts_profiles.cc | 3 +-
chrome/browser/search_resumption/BUILD.gn | 4 -
.../SearchResumptionModuleMediator.java | 37 +--
.../SearchResumptionModuleUtils.java | 12 -
@@ -116,13 +119,14 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../browser/password_manager_client_helper.cc | 43 +---
.../core/browser/sync_credentials_filter.cc | 49 +---
components/signin/features.gni | 4 +-
.../primary_account_manager.cc | 17 +-
...e_oauth2_token_service_delegate_android.cc | 125 +---------
...le_oauth2_token_service_delegate_android.h | 10 -
.../signin/SystemAccountManagerDelegate.java | 25 +-
.../ProfileOAuth2TokenServiceDelegate.java | 52 ----
.../net/HttpNegotiateAuthenticator.java | 88 +------
.../chromoting/base/OAuthTokenFetcher.java | 2 -
103 files changed, 89 insertions(+), 2641 deletions(-)
107 files changed, 101 insertions(+), 2699 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
@@ -611,7 +615,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
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
+++ b/chrome/android/java/res/xml/google_services_preferences.xml
@@ -21,17 +21,10 @@ found in the LICENSE file.
@@ -21,16 +21,6 @@ found in the LICENSE file.
android:key="metrics_settings"
android:title="@string/manage_metrics_settings"
android:fragment="org.chromium.chrome.browser.metrics_settings.MetricsSettingsFragment"/>
@@ -619,16 +623,15 @@ diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrom
- android:key="url_keyed_anonymized_data"
- android:title="@string/url_keyed_anonymized_data_title"
- android:summary="@string/url_keyed_anonymized_data_summary"
- android:persistent="false"/>
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="search_suggestions"
android:title="@string/improve_search_suggestions_title"
android:summary="@string/improve_search_suggestions_summary"
- android:persistent="false"/>
- <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
- android:key="search_suggestions"
- android:title="@string/improve_search_suggestions_title"
- android:summary="@string/improve_search_suggestions_summary"
- android:persistent="false"/>
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="price_tracking_annotations"
android:title="@string/track_prices_on_tabs"
android:summary="@string/track_prices_on_tabs_description"
diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
--- a/chrome/android/java/res/xml/main_preferences.xml
+++ b/chrome/android/java/res/xml/main_preferences.xml
@@ -1041,6 +1044,54 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/feed/FeedAc
}
}
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AddressEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AddressEditor.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AddressEditor.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AddressEditor.java
@@ -24,14 +24,11 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.payments.AutofillAddress;
import org.chromium.chrome.browser.payments.AutofillAddress.CompletenessCheckType;
import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
-import org.chromium.chrome.browser.sync.SyncService;
import org.chromium.components.autofill.prefeditor.EditorFieldModel;
import org.chromium.components.autofill.prefeditor.EditorFieldModel.EditorFieldValidator;
import org.chromium.components.signin.base.CoreAccountInfo;
import org.chromium.components.signin.identitymanager.ConsentLevel;
import org.chromium.components.signin.identitymanager.IdentityManager;
-import org.chromium.components.sync.UserSelectableType;
import java.util.HashMap;
import java.util.HashSet;
@@ -159,13 +156,8 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
String deleteConfirmationTitle =
mContext.getString(R.string.autofill_delete_address_confirmation_dialog_title);
if (mProfile.getSource() == Source.ACCOUNT) {
- final IdentityManager identityManager =
- IdentityServicesProvider.get().getIdentityManager(
- Profile.getLastUsedRegularProfile());
- CoreAccountInfo accountInfo =
- identityManager.getPrimaryAccountInfo(ConsentLevel.SIGNIN);
@Nullable
- String email = CoreAccountInfo.getEmailFrom(accountInfo);
+ String email = "";
if (email != null) {
footerMessageText =
@@ -176,14 +168,8 @@ public class AddressEditor extends EditorBase<AutofillAddress> {
.replace("$1", email);
}
} else {
- if (SyncService.get().isSyncFeatureEnabled()
- && SyncService.get().getSelectedTypes().contains(UserSelectableType.AUTOFILL)) {
- deleteConfirmationText =
- mContext.getString(R.string.autofill_delete_sync_address_source_notice);
- } else {
deleteConfirmationText =
mContext.getString(R.string.autofill_delete_local_address_source_notice);
- }
}
mEditor = new EditorModel(editTitle, mCustomDoneButtonText, footerMessageText,
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantPreferenceFragment.java
@@ -1074,7 +1125,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private static final int MAXIMUM_NUMBER_OF_SEARCH_RESULTS = 500;
private static final String EMPTY_QUERY = null;
@@ -69,7 +66,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@@ -62,14 +59,12 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
private final List<BookmarkId> mTopLevelFolders = new ArrayList<>();
private final Profile mProfile;
- private final SyncService mSyncService;
// There can only be one promo header at a time. This takes on one of the values:
// ViewType.PERSONALIZED_SIGNIN_PROMO, ViewType.SYNC_PROMO, or ViewType.INVALID.
@ViewType
private int mPromoHeaderType = ViewType.INVALID;
private BookmarkDelegate mDelegate;
@@ -1082,7 +1140,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
private ViewFactory mViewFactory;
private String mSearchText;
private BookmarkId mCurrentFolder;
@@ -129,8 +125,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@@ -129,8 +124,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
BookmarkItemsAdapter(Context context, Profile profile) {
super(context);
mProfile = profile;
@@ -1091,7 +1149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
}
/**
@@ -163,11 +157,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@@ -163,11 +156,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
clearHighlight();
mElements.clear();
@@ -1103,7 +1161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
updateHeader(false);
if (BookmarkId.SHOPPING_FOLDER.equals(mCurrentFolder)) {
filterForPriceTrackingCategory(bookmarks);
@@ -213,12 +202,7 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@@ -213,12 +201,7 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@Override
public void onBindViewHolder(ViewHolder holder, int position) {
@@ -1117,7 +1175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
bindSectionHeaderViewHolder(holder.itemView, getItemByPosition(position));
} else if (BookmarkListEntry.isBookmarkEntry(holder.getItemViewType())) {
BookmarkRow row = ((BookmarkRow) holder.itemView);
@@ -265,7 +249,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@@ -265,7 +248,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
case ViewType.PERSONALIZED_SIGNIN_PROMO:
// fall through
case ViewType.PERSONALIZED_SYNC_PROMO:
@@ -1125,7 +1183,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
break;
default:
// Other view holders don't have special recycling code.
@@ -289,7 +272,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@@ -289,7 +271,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
updateHeader(true);
};
@@ -1133,7 +1191,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
populateTopLevelFoldersList();
mViewFactory = viewFactory;
@@ -306,8 +288,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@@ -306,8 +287,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
mDelegate.getModel().removeObserver(mBookmarkModelObserver);
mDelegate.getSelectionDelegate().removeObserver(this);
mDelegate = null;
@@ -1142,7 +1200,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
}
@Override
@@ -405,18 +385,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@@ -405,18 +384,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
setOrder(mElements);
}
@@ -1161,7 +1219,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* Updates mPromoHeaderType. Makes sure that the 0th index of mElements is consistent with the
* promo header. This 0th index is null iff there is a promo header.
@@ -437,29 +405,12 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@@ -437,29 +404,12 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
} else if (currentUIState == BookmarkUIState.STATE_SEARCHING) {
mPromoHeaderType = ViewType.INVALID;
} else {
@@ -1191,7 +1249,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
if (shouldNotify) notifyItemInserted(0);
} else if (wasShowingPromo && willShowPromo) {
if (shouldNotify) notifyItemChanged(0);
@@ -578,7 +529,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@@ -578,7 +528,6 @@ public class BookmarkItemsAdapter extends DragReorderableListAdapter<BookmarkLis
@VisibleForTesting
public void simulateSignInForTests() {
@@ -1920,16 +1978,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/history/History
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/IdentityDiscController.java
@@ -28,8 +28,6 @@ import org.chromium.chrome.browser.settings.MainSettings;
@@ -26,10 +26,7 @@ import org.chromium.chrome.browser.ntp.NewTabPage;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.settings.MainSettings;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
-import org.chromium.chrome.browser.signin.SyncConsentActivityLauncherImpl;
import org.chromium.chrome.browser.signin.services.DisplayableProfileData;
-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
-import org.chromium.chrome.browser.signin.services.ProfileDataCache;
import org.chromium.chrome.browser.signin.services.SigninManager;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tasks.ReturnToChromeUtil;
@@ -45,9 +43,6 @@ import org.chromium.components.feature_engagement.EventConstants;
@@ -45,9 +42,6 @@ import org.chromium.components.feature_engagement.EventConstants;
import org.chromium.components.feature_engagement.FeatureConstants;
import org.chromium.components.feature_engagement.Tracker;
import org.chromium.components.signin.base.CoreAccountInfo;
@@ -1939,7 +1999,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
import org.chromium.components.signin.metrics.SigninAccessPoint;
import java.lang.annotation.Retention;
@@ -57,8 +52,7 @@ import java.lang.annotation.RetentionPolicy;
@@ -57,8 +51,7 @@ import java.lang.annotation.RetentionPolicy;
* Handles displaying IdentityDisc on toolbar depending on several conditions
* (user sign-in state, whether NTP is shown)
*/
@@ -1949,7 +2009,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
// Visual state of Identity Disc.
@Retention(RetentionPolicy.SOURCE)
@IntDef({IdentityDiscState.NONE, IdentityDiscState.SMALL, IdentityDiscState.LARGE})
@@ -80,15 +74,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
@@ -80,15 +73,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
private final ObservableSupplier<Profile> mProfileSupplier;
private final Callback<Profile> mProfileSupplierObserver = this::setProfile;
@@ -1965,7 +2025,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
// Identity disc visibility state.
@IdentityDiscState
private int mState = IdentityDiscState.NONE;
@@ -216,16 +201,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
@@ -216,16 +200,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
* IdentityDiscController for profile data updates.
*/
private void ensureProfileDataCache(@IdentityDiscState int state) {
@@ -1982,16 +2042,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
}
/**
@@ -236,7 +211,7 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
if (shouldUseSignedOutAvatar(email)) {
return AppCompatResources.getDrawable(mContext, R.drawable.account_circle_full);
}
@@ -233,10 +207,7 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
*/
private Drawable getProfileImage(@Nullable String email) {
assert mState != IdentityDiscState.NONE;
- if (shouldUseSignedOutAvatar(email)) {
- return AppCompatResources.getDrawable(mContext, R.drawable.account_circle_full);
- }
- return mProfileDataCache[mState].getProfileDataOrDefault(email).getImage();
+ return null;
}
/**
@@ -244,13 +219,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
@@ -244,13 +215,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
* when sign-in state changes.
*/
private void resetIdentityDiscCache() {
@@ -2005,7 +2068,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
}
private void notifyObservers(boolean hint) {
@@ -259,47 +227,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
@@ -259,47 +223,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
}
}
@@ -2053,7 +2116,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
/**
* Call to tear down dependencies.
*/
@@ -310,18 +237,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
@@ -310,18 +233,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
mActivityLifecycleDispatcher = null;
}
@@ -2072,7 +2135,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
if (mNativeIsInitialized) {
mProfileSupplier.removeObserver(mProfileSupplierObserver);
}
@@ -344,9 +259,7 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
@@ -344,9 +255,7 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
* @return account info for the current profile. Returns null for OTR profile.
*/
private CoreAccountInfo getSignedInAccountInfo() {
@@ -2083,7 +2146,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
}
/**
@@ -354,17 +267,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
@@ -354,17 +263,6 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
* mIdentityManager is updated with the profile, as set to null if profile is off-the-record.
*/
private void setProfile(Profile profile) {
@@ -2101,6 +2164,41 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/identity_disc/I
}
private String getContentDescription(@Nullable String email) {
@@ -376,31 +274,15 @@ public class IdentityDiscController implements NativeInitObserver, ProfileDataCa
return mContext.getString(R.string.accessibility_toolbar_btn_signed_out_identity_disc);
}
- DisplayableProfileData profileData =
- mProfileDataCache[mState].getProfileDataOrDefault(email);
- String userName = profileData.getFullName();
- if (profileData.hasDisplayableEmailAddress()) {
- return mContext.getString(
- R.string.accessibility_toolbar_btn_identity_disc_with_name_and_email, userName,
- email);
- }
-
return mContext.getString(
- R.string.accessibility_toolbar_btn_identity_disc_with_name, userName);
+ R.string.accessibility_toolbar_btn_identity_disc_with_name, "");
}
private void onClick() {
recordIdentityDiscUsed();
- SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(
- Profile.getLastUsedRegularProfile());
- if (getSignedInAccountInfo() == null && !signinManager.isSigninDisabledByPolicy()) {
- SyncConsentActivityLauncherImpl.get().launchActivityIfAllowed(
- mContext, SigninAccessPoint.NTP_SIGNED_OUT_ICON);
- } else {
- SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
- settingsLauncher.launchSettingsActivity(mContext, MainSettings.class);
- }
+ SettingsLauncher settingsLauncher = new SettingsLauncherImpl();
+ settingsLauncher.launchSettingsActivity(mContext, MainSettings.class);
}
private static boolean shouldUseSignedOutAvatar(@Nullable String email) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/init/ChromeBrowserInitializer.java
@@ -2786,7 +2884,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
private @Nullable PasswordCheck mPasswordCheck;
private Profile mProfile;
private ObservableSupplier<ModalDialogManager> mModalDialogManagerSupplier;
@@ -138,30 +121,12 @@ public class MainSettings extends PreferenceFragmentCompat
@@ -138,30 +121,13 @@ public class MainSettings extends PreferenceFragmentCompat
@Override
public void onStart() {
super.onStart();
@@ -2803,7 +2901,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
@Override
public void onStop() {
super.onStop();
SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(mProfile);
- SigninManager signinManager = IdentityServicesProvider.get().getSigninManager(mProfile);
- if (signinManager.isSigninSupported()) {
- signinManager.removeSignInStateObserver(this);
- }
@@ -2811,13 +2909,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
- if (syncService != null) {
- syncService.removeSyncStateChangedListener(this);
- }
- }
-
}
- @Override
public void onResume() {
super.onResume();
updatePreferences();
@@ -232,8 +197,6 @@ public class MainSettings extends PreferenceFragmentCompat
@@ -232,8 +198,6 @@ public class MainSettings extends PreferenceFragmentCompat
Preference preference = getPreferenceScreen().getPreference(index);
mAllPreferences.put(preference.getKey(), preference);
}
@@ -2826,7 +2924,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
}
private void setManagedPreferenceDelegateForPreference(String key) {
@@ -242,13 +205,6 @@ public class MainSettings extends PreferenceFragmentCompat
@@ -242,13 +206,6 @@ public class MainSettings extends PreferenceFragmentCompat
}
private void updatePreferences() {
@@ -2840,7 +2938,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
updateSearchEnginePreference();
updatePasswordsPreference();
@@ -282,35 +238,6 @@ public class MainSettings extends PreferenceFragmentCompat
@@ -282,35 +239,6 @@ public class MainSettings extends PreferenceFragmentCompat
if (preference != null) getPreferenceScreen().removePreference(preference);
}
@@ -2876,7 +2974,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
private void updateSearchEnginePreference() {
TemplateUrlService templateUrlService = TemplateUrlServiceFactory.getForProfile(mProfile);
if (!templateUrlService.isLoaded()) {
@@ -346,8 +273,7 @@ public class MainSettings extends PreferenceFragmentCompat
@@ -346,8 +274,7 @@ public class MainSettings extends PreferenceFragmentCompat
}
private boolean shouldShowNewLabelForPasswordsPreference() {
@@ -2886,7 +2984,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
}
// TODO(crbug.com/1217070): remove this method once UPM feature is rolled out.
@@ -378,19 +304,6 @@ public class MainSettings extends PreferenceFragmentCompat
@@ -378,19 +305,6 @@ public class MainSettings extends PreferenceFragmentCompat
pref.setSummary(isOn ? R.string.text_on : R.string.text_off);
}
@@ -2906,7 +3004,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
// TemplateUrlService.LoadListener implementation.
@Override
public void onTemplateUrlServiceLoaded() {
@@ -398,12 +311,6 @@ public class MainSettings extends PreferenceFragmentCompat
@@ -398,12 +312,6 @@ public class MainSettings extends PreferenceFragmentCompat
updateSearchEnginePreference();
}
@@ -3828,6 +3926,50 @@ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/b
- });
}
}
diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java
--- a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java
+++ b/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/browser/privacy_guide/PrivacyGuideUtils.java
@@ -10,7 +10,6 @@ import android.content.Intent;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.safe_browsing.SafeBrowsingBridge;
import org.chromium.chrome.browser.safe_browsing.SafeBrowsingState;
-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
import org.chromium.chrome.browser.sync.SyncService;
import org.chromium.components.content_settings.CookieControlsMode;
import org.chromium.components.content_settings.PrefNames;
@@ -36,9 +35,7 @@ class PrivacyGuideUtils {
}
static boolean isUserSignedIn() {
- IdentityManager identityManager = IdentityServicesProvider.get().getIdentityManager(
- Profile.getLastUsedRegularProfile());
- return identityManager.hasPrimaryAccount(ConsentLevel.SIGNIN);
+ return false;
}
static @SafeBrowsingState int getSafeBrowsingState() {
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -363,8 +363,10 @@
#if !BUILDFLAG(IS_CHROMEOS_ASH) || !BUILDFLAG(IS_ANDROID)
#include "chrome/browser/profiles/profile_statistics_factory.h"
#include "chrome/browser/ui/startup/first_run_service.h"
+#if BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(ENABLE_MIRROR)
#include "chrome/browser/ui/webui/signin/turn_sync_on_helper.h"
#endif
+#endif
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_LACROS)
#include "chrome/browser/speech/speech_recognition_client_browser_interface_factory.h"
@@ -897,7 +899,6 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
TranslateModelServiceFactory::GetInstance();
#if !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_ANDROID)
- TurnSyncOnHelper::EnsureFactoryBuilt();
#endif
UnifiedConsentServiceFactory::GetInstance();
UnusedSitePermissionsServiceFactory::GetInstance();
diff --git a/chrome/browser/search_resumption/BUILD.gn b/chrome/browser/search_resumption/BUILD.gn
--- a/chrome/browser/search_resumption/BUILD.gn
+++ b/chrome/browser/search_resumption/BUILD.gn
@@ -5125,6 +5267,52 @@ diff --git a/components/signin/features.gni b/components/signin/features.gni
# Mirror is enabled and other account consistency mechanisms are not available.
-enable_mirror = is_android || is_chromeos || is_ios
+enable_mirror = false
diff --git a/components/signin/internal/identity_manager/primary_account_manager.cc b/components/signin/internal/identity_manager/primary_account_manager.cc
--- a/components/signin/internal/identity_manager/primary_account_manager.cc
+++ b/components/signin/internal/identity_manager/primary_account_manager.cc
@@ -169,21 +169,15 @@ void PrimaryAccountManager::Initialize(PrefService* local_state) {
base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
ScopedPrefCommit scoped_pref_commit(client_->GetPrefs(),
/*commit_on_destroy*/ false);
- if (cmd_line->HasSwitch(switches::kClearTokenService))
+ if ((true) || cmd_line->HasSwitch(switches::kClearTokenService))
SetPrimaryAccountInternal(CoreAccountInfo(), false, scoped_pref_commit);
- std::string pref_account_id =
- client_->GetPrefs()->GetString(prefs::kGoogleServicesAccountId);
+ std::string pref_account_id;
// Initial value for the kGoogleServicesConsentedToSync preference if it is
// missing.
- const PrefService::Preference* consented_pref =
- client_->GetPrefs()->FindPreference(
- prefs::kGoogleServicesConsentedToSync);
- if (consented_pref->IsDefaultValue()) {
- client_->GetPrefs()->SetBoolean(prefs::kGoogleServicesConsentedToSync,
- !pref_account_id.empty());
- }
+ client_->GetPrefs()->SetBoolean(prefs::kGoogleServicesConsentedToSync,
+ false);
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (!pref_account_id.empty()) {
@@ -213,8 +207,6 @@ void PrimaryAccountManager::Initialize(PrefService* local_state) {
SetPrimaryAccountInternal(CoreAccountInfo(), /*consented_to_sync=*/false,
scoped_pref_commit);
SetSyncPrimaryAccountInternal(account_info);
- } else {
- SetPrimaryAccountInternal(account_info, consented, scoped_pref_commit);
}
// It is important to only load credentials after starting to observe the
@@ -330,6 +322,7 @@ void PrimaryAccountManager::SetPrimaryAccountInternal(
bool PrimaryAccountManager::HasPrimaryAccount(
signin::ConsentLevel consent_level) const {
+ if ((true)) return false;
bool consented_pref =
client_->GetPrefs()->GetBoolean(prefs::kGoogleServicesConsentedToSync);
if (primary_account_info().account_id.empty()) {
diff --git a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc
--- a/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc
+++ b/components/signin/internal/identity_manager/profile_oauth2_token_service_delegate_android.cc
build/patches/Remove-voice-recognition-integration.patch
+28 -6
View File
@@ -4,7 +4,7 @@ Subject: Remove voice recognition integration
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../start_surface/StartSurfaceMediator.java | 7 +-
.../start_surface/StartSurfaceMediator.java | 15 +--
.../features/tasks/TasksSurfaceMediator.java | 4 -
.../init/ProcessInitializationHandler.java | 5 -
.../browser/metrics/UmaSessionStats.java | 19 ---
@@ -23,12 +23,20 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../suggestions/AutocompleteController.java | 21 ----
.../suggestions/AutocompleteCoordinator.java | 8 --
.../suggestions/AutocompleteMediator.java | 9 --
19 files changed, 12 insertions(+), 355 deletions(-)
19 files changed, 12 insertions(+), 363 deletions(-)
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
+++ b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -473,8 +473,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -73,7 +73,6 @@ import org.chromium.chrome.browser.ntp.NewTabPageLaunchOrigin;
import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
import org.chromium.chrome.browser.omnibox.OmniboxStub;
import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
@@ -473,8 +472,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
// Initialize
// Note that isVoiceSearchEnabled will return false in incognito mode.
@@ -38,7 +46,21 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
boolean shouldShowLensButton = mOmniboxStub.isLensEnabled(LensEntryPoint.TASKS_SURFACE);
LensMetrics.recordShown(LensEntryPoint.TASKS_SURFACE, shouldShowLensButton);
mPropertyModel.set(IS_LENS_BUTTON_VISIBLE, shouldShowLensButton);
@@ -1317,10 +1316,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -518,13 +516,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
}
});
mPropertyModel.set(VOICE_SEARCH_BUTTON_CLICK_LISTENER, v -> {
- FeedReliabilityLogger feedReliabilityLogger = getFeedReliabilityLogger();
- if (feedReliabilityLogger != null) {
- feedReliabilityLogger.onVoiceSearch();
- }
- mOmniboxStub.getVoiceRecognitionHandler().startVoiceRecognition(
- VoiceRecognitionHandler.VoiceInteractionSource.TASKS_SURFACE);
- RecordUserAction.record("TasksSurface.FakeBox.VoiceSearch");
});
mPropertyModel.set(LENS_BUTTON_CLICK_LISTENER, v -> {
@@ -1317,10 +1308,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
// incorrect state if check synchronously.
ThreadUtils.postOnUiThread(() -> {
if (mOmniboxStub != null) {
@@ -524,7 +546,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
mToolbarManager.destroy();
mToolbarManager = null;
}
@@ -1069,19 +1063,11 @@ public class RootUiCoordinator
@@ -1058,19 +1052,11 @@ public class RootUiCoordinator
new VoiceToolbarButtonController.VoiceSearchDelegate() {
@Override
public boolean isVoiceSearchEnabled() {
@@ -545,7 +567,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
}
};
VoiceToolbarButtonController voiceToolbarButtonController =
@@ -1130,13 +1116,6 @@ public class RootUiCoordinator
@@ -1119,13 +1105,6 @@ public class RootUiCoordinator
if (!mSupportsAppMenuSupplier.getAsBoolean()) {
mToolbarManager.getToolbar().disableMenuButton();
}
build/patches/Restore-adaptive-button-in-top-toolbar-customization.patch
+1 -1
View File
@@ -28,7 +28,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/MainSe
import org.chromium.chrome.browser.toolbar.adaptive.AdaptiveToolbarStatePredictor;
import org.chromium.chrome.browser.tracing.settings.DeveloperSettings;
import org.chromium.components.browser_ui.settings.ChromeBasePreference;
@@ -182,7 +183,9 @@ public class MainSettings extends PreferenceFragmentCompat
@@ -183,7 +184,9 @@ public class MainSettings extends PreferenceFragmentCompat
new AdaptiveToolbarStatePredictor(null).recomputeUiState(uiState -> {
// We don't show the toolbar shortcut settings page if disabled from finch.
build/patches/Revert-the-removal-of-an-option-to-block-autoplay.patch
+2 -11
View File
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../drawable-xxxhdpi/settings_autoplay.png | Bin 0 -> 1064 bytes
.../res/xml/site_settings_preferences.xml | 4 ++++
.../ContentSettingsResources.java | 5 +++-
.../site_settings/SingleCategorySettings.java | 11 +++++++++
.../site_settings/SingleCategorySettings.java | 9 +++++++
.../site_settings/SingleWebsiteSettings.java | 22 ++++++++++++++++++
.../site_settings/SiteSettingsCategory.java | 9 +++++--
.../browser_ui/site_settings/Website.java | 9 +++++++
@@ -36,7 +36,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../platform/web_content_settings_client.h | 3 +++
.../core/html/media/autoplay_policy.cc | 12 ++++++++++
.../core/html/media/autoplay_policy.h | 4 ++++
31 files changed, 128 insertions(+), 4 deletions(-)
31 files changed, 126 insertions(+), 4 deletions(-)
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-hdpi/settings_autoplay.png
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-mdpi/settings_autoplay.png
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xhdpi/settings_autoplay.png
@@ -221,15 +221,6 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
default:
break;
}
@@ -1190,6 +1199,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
Preference infoText = screen.findPreference(INFO_TEXT_KEY);
if (mCategory.getType() == SiteSettingsCategory.Type.COOKIES) {
infoText.setSummary(R.string.website_settings_cookie_info);
+ } else if (mCategory.getType() == SiteSettingsCategory.Type.AUTOPLAY) {
+ allowSpecifyingExceptions = true;
} else if (mCategory.getType() == SiteSettingsCategory.Type.SITE_DATA) {
infoText.setSummary(R.string.website_settings_site_data_page_description);
} else if (mCategory.getType() == SiteSettingsCategory.Type.THIRD_PARTY_COOKIES) {
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
build/patches/Site-setting-for-images.patch
+2 -11
View File
@@ -13,7 +13,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../drawable-xxxhdpi/permission_images.png | Bin 0 -> 532 bytes
.../res/xml/site_settings_preferences.xml | 4 ++++
.../ContentSettingsResources.java | 4 ++++
.../site_settings/SingleCategorySettings.java | 11 +++++++++
.../site_settings/SingleCategorySettings.java | 9 +++++++
.../site_settings/SingleWebsiteSettings.java | 22 ++++++++++++++++++
.../site_settings/SiteSettingsCategory.java | 9 +++++--
.../site_settings/SiteSettingsUtil.java | 1 +
@@ -27,7 +27,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
components/page_info/page_info.cc | 7 ++++--
components/page_info/page_info_ui.cc | 4 ++--
components/site_settings_strings.grdp | 12 +++++-----
22 files changed, 90 insertions(+), 19 deletions(-)
22 files changed, 88 insertions(+), 19 deletions(-)
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-hdpi/permission_images.png
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-mdpi/permission_images.png
create mode 100644 components/browser_ui/site_settings/android/java/res/drawable-xhdpi/permission_images.png
@@ -213,15 +213,6 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/c
case SiteSettingsCategory.Type.JAVASCRIPT_JIT:
allowSpecifyingExceptions = true;
break;
@@ -1210,6 +1219,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
infoText.setSummary(R.string.website_settings_cookie_info);
} else if (mCategory.getType() == SiteSettingsCategory.Type.AUTOPLAY) {
allowSpecifyingExceptions = true;
+ } else if (mCategory.getType() == SiteSettingsCategory.Type.IMAGES) {
+ allowSpecifyingExceptions = true;
} else if (mCategory.getType() == SiteSettingsCategory.Type.JAVASCRIPT_JIT) {
allowSpecifyingExceptions = true;
} else if (mCategory.getType() == SiteSettingsCategory.Type.SITE_DATA) {
diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
--- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
+++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleWebsiteSettings.java
build/patches/ungoogled-chromium-no-special-hosts-domains.patch
+3 -3
View File
@@ -84,7 +84,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//chrome/browser/headless",
"//chrome/common",
"//chrome/common:buildflags",
@@ -7373,8 +7367,6 @@ static_library("browser") {
@@ -7375,8 +7369,6 @@ static_library("browser") {
"supervised_user/parental_control_metrics.cc",
"supervised_user/parental_control_metrics.h",
"supervised_user/permission_request_creator.h",
@@ -558,7 +558,7 @@ diff --git a/chrome/browser/page_load_metrics/page_load_metrics_initialize.cc b/
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -593,7 +593,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -592,7 +592,6 @@ void ChromeBrowserMainExtraPartsProfiles::
GalleryWatchManager::EnsureFactoryBuilt();
GlobalErrorServiceFactory::GetInstance();
#endif
@@ -660,7 +660,7 @@ diff --git a/chrome/renderer/url_loader_throttle_provider_impl.cc b/chrome/rende
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -5896,7 +5896,6 @@ test("unit_tests") {
@@ -5894,7 +5894,6 @@ test("unit_tests") {
"//chrome/browser/favicon",
"//chrome/browser/feature_guide/notifications:unit_tests",
"//chrome/browser/first_party_sets",