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

patches for v112

Browse Source
This commit is contained in:
Carmelo Messina
2023-03-30 14:32:34 +02:00
parent 58ca50c96b
commit 66cfb0d389
9 changed files with 1104 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00109-ADDTO-Remove-price-shopping-commerce-integra.patch
+24 -40
View File
@@ -3,15 +3,15 @@ Date: Thu, 5 Jan 2023 11:29:23 +0000
Subject: 109 ADDTO Remove price/shopping/commerce integra
---
.../chrome/browser/app/ChromeActivity.java | 4 ----
.../bookmarks/BookmarkSaveFlowMediator.java | 20 -------------------
.../commerce/core/commerce_feature_list.cc | 4 ++--
3 files changed, 2 insertions(+), 26 deletions(-)
.../org/chromium/chrome/browser/app/ChromeActivity.java | 4 ----
.../chrome/browser/bookmarks/BookmarkSaveFlowMediator.java | 1 -
components/commerce/core/commerce_feature_list.cc | 7 ++++---
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java
@@ -2335,10 +2335,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -2332,10 +2332,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
}
if (id == R.id.disable_price_tracking_menu_id) {
@@ -33,44 +33,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.components.bookmarks.BookmarkId;
import org.chromium.components.bookmarks.BookmarkItem;
@@ -39,8 +38,6 @@ public class BookmarkSaveFlowMediator
private BookmarkId mBookmarkId;
private PowerBookmarkMeta mPowerBookmarkMeta;
private boolean mWasBookmarkMoved;
- private CommerceSubscription mSubscription;
- private Callback<Boolean> mSubscriptionsManagerCallback;
private String mFolderName;
/**
@@ -120,23 +117,6 @@ public class BookmarkSaveFlowMediator
}
void handleNotificationSwitchToggle(CompoundButton view, boolean toggled) {
- if (mSubscriptionsManagerCallback == null) {
- mSubscriptionsManagerCallback =
- mCallbackController.makeCancelable((Boolean success) -> {
- setPriceTrackingToggleVisualsOnly(success && view.isChecked());
- setPriceTrackingNotificationUiEnabled(success);
- });
- }
-
- // Make sure the notification channel is initialized when the user tracks a product.
- // TODO(crbug.com/1382191): Add a SubscriptionsObserver in the PriceDropNotificationManager
- // and initialize the channel there.
- if (toggled && Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
- PriceDropNotificationManagerFactory.create().createNotificationChannel();
- }
- setPriceTrackingIconForEnabledState(toggled);
- PriceTrackingUtils.setPriceTrackingStateForBookmark(Profile.getLastUsedRegularProfile(),
- mBookmarkId.getId(), toggled, mSubscriptionsManagerCallback);
}
void setPriceTrackingNotificationUiEnabled(boolean enabled) {
diff --git a/components/commerce/core/commerce_feature_list.cc b/components/commerce/core/commerce_feature_list.cc
--- a/components/commerce/core/commerce_feature_list.cc
+++ b/components/commerce/core/commerce_feature_list.cc
@@ -128,8 +128,8 @@ BASE_FEATURE(kCommerceMerchantViewer,
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -131,7 +131,7 @@ BASE_FEATURE(kCommerceMerchantViewer,
#if BUILDFLAG(IS_ANDROID)
BASE_FEATURE(kCommerceMerchantViewerRegionLaunched,
"CommerceMerchantViewerRegionLaunched",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ base::FEATURE_DISABLED_BY_DEFAULT);
#else
BASE_FEATURE(kCommerceMerchantViewerRegionLaunched,
"CommerceMerchantViewerRegionLaunched",
@@ -139,8 +139,8 @@ BASE_FEATURE(kCommerceMerchantViewerRegionLaunched,
#endif // BUILDFLAG(IS_ANDROID)
BASE_FEATURE(kCommercePriceTracking,
- "CommercePriceTracking",
@@ -80,5 +56,13 @@ diff --git a/components/commerce/core/commerce_feature_list.cc b/components/comm
const base::FeatureParam<bool> kDeleteAllMerchantsOnClearBrowsingHistory{
&kCommerceMerchantViewer, "delete_all_merchants_on_clear_history", false};
@@ -376,6 +376,7 @@ std::string GetCurrentCountryCode(variations::VariationsService* variations) {
bool IsEnabledForCountryAndLocale(const base::Feature& feature,
std::string country,
std::string locale) {
+ if ((true)) return false;
const CountryLocaleMap& allowedCountryLocales =
GetAllowedCountryToLocaleMap();
--
2.25.1
build/patches/00110-ADDTO-Remove-signin-and-sync-integrations.patch
+1 -38
View File
@@ -5,11 +5,10 @@ Subject: 110 ADDTO Remove signin and sync integrations
---
.../java/res/xml/privacy_preferences_v2.xml | 4 --
.../PasswordManagerLauncher.java | 1 -
.../browser/commerce/ShoppingFeatures.java | 11 +---
.../PasswordManagerHelper.java | 20 -------
...StoreAndroidBackendReceiverBridgeImpl.java | 10 ----
...d_manager_settings_service_android_impl.cc | 59 ++-----------------
6 files changed, 8 insertions(+), 97 deletions(-)
5 files changed, 5 insertions(+), 89 deletions(-)
diff --git a/chrome/android/java/res/xml/privacy_preferences_v2.xml b/chrome/android/java/res/xml/privacy_preferences_v2.xml
--- a/chrome/android/java/res/xml/privacy_preferences_v2.xml
@@ -34,42 +33,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
PasswordManagerHelper.showPasswordSettings(activity, referrer, new SettingsLauncherImpl(),
modalDialogManagerSupplier);
}
diff --git a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java b/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java
--- a/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java
+++ b/chrome/browser/commerce/android/java/src/org/chromium/chrome/browser/commerce/ShoppingFeatures.java
@@ -8,8 +8,6 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.flags.MutableFlagWithSafeDefault;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
-import org.chromium.chrome.browser.signin.services.UnifiedConsentServiceBridge;
import org.chromium.components.prefs.PrefService;
import org.chromium.components.signin.identitymanager.ConsentLevel;
import org.chromium.components.user_prefs.UserPrefs;
@@ -25,14 +23,11 @@ public class ShoppingFeatures {
}
private static boolean isSignedIn() {
- return IdentityServicesProvider.get()
- .getIdentityManager(Profile.getLastUsedRegularProfile())
- .hasPrimaryAccount(ConsentLevel.SYNC);
+ return false;
}
private static boolean isAnonymizedUrlDataCollectionEnabled() {
- return UnifiedConsentServiceBridge.isUrlKeyedAnonymizedDataCollectionEnabled(
- Profile.getLastUsedRegularProfile());
+ return false;
}
private static boolean isWebAndAppActivityEnabled() {
@@ -40,4 +35,4 @@ public class ShoppingFeatures {
return prefService != null
&& prefService.getBoolean(Pref.WEB_AND_APP_ACTIVITY_ENABLED_FOR_SHOPPING);
}
-}
\ No newline at end of file
+}
diff --git a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
--- a/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
+++ b/chrome/browser/password_manager/android/java/src/org/chromium/chrome/browser/password_manager/PasswordManagerHelper.java
build/patches/00WIN-ADDTO-Disable-safe-browsing.patch
+106 -97
View File
@@ -8,7 +8,7 @@ Subject: WIN ADDTO Disable safe browsing
chrome/browser/chrome_browser_main_win.cc | 6 -
.../bubble/download_bubble_controller.cc | 2 +
.../chrome_download_manager_delegate.cc | 4 +-
.../browser/download/download_item_model.cc | 92 +---------
.../browser/download/download_item_model.cc | 93 +---------
.../analysis/content_analysis_delegate.cc | 164 +-----------------
.../analysis/content_analysis_delegate.h | 7 -
.../analysis/request_handler_base.cc | 20 ---
@@ -34,7 +34,7 @@ Subject: WIN ADDTO Disable safe browsing
chrome/browser/safe_browsing/BUILD.gn | 8 +-
.../safe_browsing/chrome_cleaner/BUILD.gn | 1 -
.../chrome_cleaner/settings_resetter_win.cc | 1 -
.../download_protection/file_analyzer.h | 18 --
.../download_protection/file_analyzer.h | 20 ---
.../chrome_security_blocking_page_factory.cc | 21 ---
chrome/browser/ui/BUILD.gn | 6 -
...b_modal_dialog_manager_delegate_desktop.cc | 1 -
@@ -43,7 +43,7 @@ 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 | 6 +-
chrome/browser/ui/webui/intro/intro_ui.cc | 11 +-
chrome/browser/webshare/share_service_impl.cc | 4 +
chrome/chrome_paks.gni | 2 -
.../public/cpp/sandboxed_rar_analyzer.cc | 16 +-
@@ -54,12 +54,12 @@ Subject: WIN ADDTO Disable safe browsing
.../core/common/safe_browsing_prefs.cc | 2 +-
printing/buildflags/buildflags.gni | 2 +-
.../tracked_persistent_pref_store_factory.cc | 10 +-
51 files changed, 68 insertions(+), 792 deletions(-)
51 files changed, 73 insertions(+), 795 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1922,10 +1922,6 @@ static_library("browser") {
@@ -1932,10 +1932,6 @@ static_library("browser") {
"//chrome/browser/ui",
"//chrome/browser/storage_access_api:permissions",
"//chrome/browser/top_level_storage_access_api:permissions",
@@ -70,7 +70,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
# TODO(crbug.com/1030821): Eliminate usages of browser.h from Media Router.
"//chrome/browser/media/router",
@@ -2027,10 +2023,7 @@ static_library("browser") {
@@ -2038,10 +2034,7 @@ static_library("browser") {
"//chrome/browser/push_messaging:budget_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
"//chrome/browser/resource_coordinator:tab_manager_features",
@@ -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",
@@ -3645,18 +3638,12 @@ static_library("browser") {
@@ -3655,18 +3648,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",
@@ -7907,7 +7894,6 @@ static_library("test_support") {
@@ -7918,7 +7905,6 @@ static_library("test_support") {
":browser",
"//chrome/browser/autofill:test_support",
"//chrome/browser/profiles:profile",
@@ -112,7 +112,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
@@ -652,8 +652,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -653,8 +653,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
base::BindOnce(
&ChromeBrowsingDataRemoverDelegate::CreateTaskCompletionClosure,
base::Unretained(this), TracingDataType::kCookies));
@@ -140,7 +140,7 @@ diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_b
diff --git a/chrome/browser/download/bubble/download_bubble_controller.cc b/chrome/browser/download/bubble/download_bubble_controller.cc
--- a/chrome/browser/download/bubble/download_bubble_controller.cc
+++ b/chrome/browser/download/bubble/download_bubble_controller.cc
@@ -400,8 +400,10 @@ void DownloadBubbleUIController::ProcessDownloadButtonPress(
@@ -458,8 +458,10 @@ void DownloadBubbleUIController::ProcessDownloadButtonPress(
commands.ExecuteCommand(command);
break;
case DownloadCommands::REVIEW:
@@ -154,7 +154,7 @@ 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
@@ -1705,8 +1705,8 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAllowed(
@@ -1706,8 +1706,8 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAllowed(
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
@@ -168,7 +168,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc
--- a/chrome/browser/download/download_item_model.cc
+++ b/chrome/browser/download/download_item_model.cc
@@ -891,6 +891,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
@@ -900,6 +900,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
DownloadUIModel::ExecuteCommand(download_commands, command);
break;
case DownloadCommands::DEEP_SCAN:
@@ -176,7 +176,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
safe_browsing::SafeBrowsingService* sb_service =
g_browser_process->safe_browsing_service();
if (!sb_service)
@@ -923,106 +924,17 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
@@ -932,107 +933,17 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
safe_browsing::DeepScanningRequest::DeepScanTrigger::
TRIGGER_APP_PROMPT,
safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
@@ -198,7 +198,8 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
- return DownloadUIModel::BubbleUIInfo(
- l10n_util::GetStringUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SUSPICIOUS_ARCHIVE))
- .AddIconAndColor(views::kInfoIcon, ui::kColorAlertMediumSeverity)
- .AddIconAndColor(vector_icons::kNotSecureWarningIcon,
- ui::kColorAlertMediumSeverity)
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
- .AddSubpageButton(l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
- DownloadCommands::Command::DISCARD,
@@ -231,7 +232,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
- l10n_util::GetStringFUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_COOKIE_THEFT_AND_ACCOUNT,
- base::ASCIIToUTF16(email)))
- .AddIconAndColor(vector_icons::kNotSecureWarningIcon,
- .AddIconAndColor(vector_icons::kDangerousIcon,
- ui::kColorAlertHighSeverity)
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
- .AddSubpageButton(
@@ -243,7 +244,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
- return DownloadUIModel::BubbleUIInfo(
- l10n_util::GetStringUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_COOKIE_THEFT))
- .AddIconAndColor(vector_icons::kNotSecureWarningIcon,
- .AddIconAndColor(vector_icons::kDangerousIcon,
- ui::kColorAlertHighSeverity)
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
- .AddSubpageButton(l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
@@ -612,15 +613,15 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/request_handler_base.
diff --git a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
--- a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
+++ b/chrome/browser/enterprise/connectors/reporting/realtime_reporting_client.cc
@@ -322,6 +322,7 @@ void RealtimeReportingClient::ReportRealtimeEvent(
const std::string& name,
@@ -338,6 +338,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp(
const enterprise_connectors::ReportingSettings& settings,
base::Value::Dict event) {
base::Value::Dict event,
const base::Time& time) {
+ if ((true)) return;
if (rejected_dm_token_timers_.contains(settings.dm_token)) {
return;
}
@@ -387,7 +388,7 @@ void RealtimeReportingClient::ReportRealtimeEvent(
@@ -406,7 +407,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp(
}
std::string RealtimeReportingClient::GetProfileUserName() const {
@@ -632,7 +633,7 @@ diff --git a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_c
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -745,9 +745,6 @@ static_library("extensions") {
@@ -747,9 +747,6 @@ static_library("extensions") {
# TODO(crbug.com/1065748): Remove this circular dependency.
"//chrome/browser/web_applications/extensions",
@@ -642,7 +643,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL
]
# Since browser and browser_extensions actually depend on each other,
@@ -799,8 +796,6 @@ static_library("extensions") {
@@ -801,8 +798,6 @@ static_library("extensions") {
"//chrome/browser/profiles:profile",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
@@ -676,7 +677,7 @@ diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/brows
}
CookiesGetAllFunction::CookiesGetAllFunction() {
@@ -383,26 +368,6 @@ void CookiesGetAllFunction::GetCookieListCallback(
@@ -377,26 +362,6 @@ void CookiesGetAllFunction::GetCookieListCallback(
}
void CookiesGetAllFunction::NotifyExtensionTelemetry() {
@@ -719,7 +720,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc
@@ -354,10 +354,7 @@ void SafeBrowsingPrivateEventRouter::OnPolicySpecifiedPasswordReuseDetected(
@@ -359,10 +359,7 @@ void SafeBrowsingPrivateEventRouter::OnPolicySpecifiedPasswordReuseDetected(
event.Set(kKeyUserName, params.user_name);
event.Set(kKeyIsPhishingUrl, params.is_phishing_url);
event.Set(kKeyProfileUserName, GetProfileUserName());
@@ -731,9 +732,9 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
reporting_client_->ReportRealtimeEvent(
kKeyPasswordReuseEvent, std::move(settings.value()), std::move(event));
@@ -436,8 +433,7 @@ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadOpened(
if (content_size >= 0)
@@ -442,8 +439,7 @@ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadOpened(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, kTriggerFileDownload);
- event.Set(kKeyEventResult, safe_browsing::EventResultToString(
- safe_browsing::EventResult::BYPASSED));
@@ -741,7 +742,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
event.Set(kKeyClickedThrough, true);
event.Set(kKeyThreatType, DangerTypeToThreatType(danger_type));
// The scan ID can be empty when the reported dangerous download is from a
@@ -481,22 +477,6 @@ void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown(
@@ -487,22 +483,6 @@ void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialShown(
settings->enabled_event_names.count(kKeyInterstitialEvent) == 0) {
return;
}
@@ -764,7 +765,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
}
void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded(
@@ -536,8 +516,7 @@ void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded(
@@ -542,8 +522,7 @@ void SafeBrowsingPrivateEventRouter::OnSecurityInterstitialProceeded(
event.Set(kKeyNetErrorCode, net_error_code);
event.Set(kKeyProfileUserName, params.user_name);
event.Set(kKeyClickedThrough, true);
@@ -783,7 +784,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
event.Set(kKeyClickedThrough,
event_result == safe_browsing::EventResult::BYPASSED);
if (!malware_family.empty()) {
@@ -675,7 +654,7 @@ void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent(
@@ -669,7 +648,7 @@ void SafeBrowsingPrivateEventRouter::OnSensitiveDataEvent(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, trigger);
@@ -792,7 +793,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
event.Set(kKeyClickedThrough,
event_result == safe_browsing::EventResult::BYPASSED);
if (!result.evidence_locker_filepath().empty()) {
@@ -729,8 +708,7 @@ void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed(
@@ -717,8 +696,7 @@ void SafeBrowsingPrivateEventRouter::OnAnalysisConnectorWarningBypassed(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, trigger);
@@ -802,7 +803,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
event.Set(kKeyClickedThrough, true);
if (!result.evidence_locker_filepath().empty()) {
event.Set(kKeyEvidenceLockerFilePath, result.evidence_locker_filepath());
@@ -786,7 +764,7 @@ void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent(
@@ -768,7 +746,7 @@ void SafeBrowsingPrivateEventRouter::OnUnscannedFileEvent(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, trigger);
@@ -811,7 +812,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
event.Set(kKeyClickedThrough,
event_result == safe_browsing::EventResult::BYPASSED);
@@ -838,7 +816,7 @@ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent(
@@ -820,7 +798,7 @@ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadEvent(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, kTriggerFileDownload);
@@ -820,7 +821,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
// The scan ID can be empty when the reported dangerous download is from a
// Safe Browsing verdict.
@@ -893,8 +871,7 @@ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed(
@@ -875,8 +853,7 @@ void SafeBrowsingPrivateEventRouter::OnDangerousDownloadWarningBypassed(
event.Set(kKeyContentSize, base::Int64ToValue(content_size));
}
event.Set(kKeyTrigger, kTriggerFileDownload);
@@ -830,7 +831,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
// The scan ID can be empty when the reported dangerous download is from a
// Safe Browsing verdict.
if (!scan_id.empty()) {
@@ -997,7 +974,6 @@ void SafeBrowsingPrivateEventRouter::OnUrlFilteringInterstitial(
@@ -979,7 +956,6 @@ void SafeBrowsingPrivateEventRouter::OnUrlFilteringInterstitial(
event_result == safe_browsing::EventResult::BYPASSED);
event.Set(kKeyThreatType, threat_type);
AddTriggeredRuleInfoToUrlFilteringInterstitialEvent(response, event);
@@ -838,7 +839,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
reporting_client_->ReportRealtimeEvent(kKeyUrlFilteringInterstitialEvent,
std::move(settings.value()),
@@ -1010,7 +986,7 @@ void SafeBrowsingPrivateEventRouter::SetIdentityManagerForTesting(
@@ -992,7 +968,7 @@ void SafeBrowsingPrivateEventRouter::SetIdentityManagerForTesting(
}
std::string SafeBrowsingPrivateEventRouter::GetProfileUserName() const {
@@ -850,7 +851,7 @@ diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_p
diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
@@ -720,18 +720,6 @@ void WebstorePrivateBeginInstallWithManifest3Function::OnFrictionPromptDone(
@@ -721,18 +721,6 @@ void WebstorePrivateBeginInstallWithManifest3Function::OnFrictionPromptDone(
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -869,7 +870,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1218,8 +1206,7 @@ WebstorePrivateGetReferrerChainFunction::
@@ -1219,8 +1207,7 @@ WebstorePrivateGetReferrerChainFunction::
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
Profile* profile = Profile::FromBrowserContext(browser_context());
@@ -905,7 +906,7 @@ diff --git a/chrome/browser/extensions/blocklist_state_fetcher.cc b/chrome/brows
diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chrome/browser/extensions/chrome_extensions_browser_client.cc
--- a/chrome/browser/extensions/chrome_extensions_browser_client.cc
+++ b/chrome/browser/extensions/chrome_extensions_browser_client.cc
@@ -703,56 +703,17 @@ void ChromeExtensionsBrowserClient::NotifyExtensionApiTabExecuteScript(
@@ -705,56 +705,17 @@ void ChromeExtensionsBrowserClient::NotifyExtensionApiTabExecuteScript(
content::BrowserContext* context,
const ExtensionId& extension_id,
const std::string& code) const {
@@ -966,7 +967,7 @@ diff --git a/chrome/browser/extensions/chrome_extensions_browser_client.cc b/chr
diff --git a/chrome/browser/extensions/extension_allowlist.cc b/chrome/browser/extensions/extension_allowlist.cc
--- a/chrome/browser/extensions/extension_allowlist.cc
+++ b/chrome/browser/extensions/extension_allowlist.cc
@@ -399,15 +399,6 @@ void ExtensionAllowlist::NotifyExtensionAllowlistWarningStateChanged(
@@ -400,15 +400,6 @@ void ExtensionAllowlist::NotifyExtensionAllowlistWarningStateChanged(
}
void ExtensionAllowlist::ReportExtensionReEnabledEvent() {
@@ -985,7 +986,7 @@ diff --git a/chrome/browser/extensions/extension_allowlist.cc b/chrome/browser/e
diff --git a/chrome/browser/media/webrtc/display_media_access_handler.cc b/chrome/browser/media/webrtc/display_media_access_handler.cc
--- a/chrome/browser/media/webrtc/display_media_access_handler.cc
+++ b/chrome/browser/media/webrtc/display_media_access_handler.cc
@@ -124,7 +124,6 @@ void DisplayMediaAccessHandler::HandleRequest(
@@ -122,7 +122,6 @@ void DisplayMediaAccessHandler::HandleRequest(
blink::mojom::StreamDevicesSet(),
blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED,
/*ui=*/nullptr);
@@ -1066,7 +1067,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
// Retrieves and formats the saved passwords domains from signon_realms.
std::vector<std::string> GetMatchingDomains(
const std::vector<password_manager::MatchingReusedCredential>&
@@ -921,7 +921,7 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
@@ -906,7 +906,7 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
bool password_field_exists,
uint64_t reused_password_hash,
const std::string& domain) {
@@ -1075,7 +1076,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
// If the webpage is not an extension page, do nothing.
if (!GURL(domain).SchemeIs(kExtensionScheme)) {
return;
@@ -961,7 +961,18 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
@@ -946,7 +946,18 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
}
@@ -1098,7 +1099,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -1959,13 +1959,6 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
@@ -1986,13 +1986,6 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
@@ -1115,7 +1116,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1694,8 +1694,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1634,8 +1634,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
component_updater::RegisterProfilePrefsForSwReporter(registry);
FontPrewarmerTabHelper::RegisterProfilePrefs(registry);
NetworkProfileBubble::RegisterProfilePrefs(registry);
@@ -1139,8 +1140,8 @@ diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/prin
- base::FeatureList::IsEnabled(features::kEnablePrintContentAnalysis) &&
- enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
- Profile::FromBrowserContext(web_contents()->GetBrowserContext()),
- web_contents()->GetLastCommittedURL(), &scanning_data,
- enterprise_connectors::AnalysisConnector::PRINT)) {
- web_contents()->GetOutermostWebContents()->GetLastCommittedURL(),
- &scanning_data, enterprise_connectors::AnalysisConnector::PRINT)) {
- set_snapshotting_for_content_analysis();
- GetPrintRenderFrame(rfh)->SnapshotForContentAnalysis(base::BindOnce(
- &PrintViewManager::OnGotSnapshotCallback, weak_factory_.GetWeakPtr(),
@@ -1166,7 +1167,7 @@ diff --git a/chrome/browser/profiles/profiles_state.cc b/chrome/browser/profiles
diff --git a/chrome/browser/resources/BUILD.gn b/chrome/browser/resources/BUILD.gn
--- a/chrome/browser/resources/BUILD.gn
+++ b/chrome/browser/resources/BUILD.gn
@@ -106,7 +106,6 @@ group("resources") {
@@ -107,7 +107,6 @@ group("resources") {
if (!is_android && !is_chromeos_ash) {
public_deps += [
@@ -1186,7 +1187,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
if (false) {
sources = [
"chrome_controller_client.cc",
@@ -442,7 +442,7 @@ static_library("safe_browsing") {
@@ -443,7 +443,7 @@ static_library("safe_browsing") {
}
}
@@ -1195,7 +1196,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
sources = [
"verdict_cache_manager_factory.cc",
"verdict_cache_manager_factory.h",
@@ -463,7 +463,7 @@ source_set("verdict_cache_manager_factory") {
@@ -466,7 +466,7 @@ source_set("verdict_cache_manager_factory") {
]
}
@@ -1204,7 +1205,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
sources = [
"advanced_protection_status_manager.cc",
"advanced_protection_status_manager.h",
@@ -483,7 +483,7 @@ static_library("advanced_protection") {
@@ -488,7 +488,7 @@ static_library("advanced_protection") {
]
}
@@ -1216,7 +1217,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn b/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
--- a/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
+++ b/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn
@@ -62,7 +62,6 @@ static_library("chrome_cleaner") {
@@ -66,7 +66,6 @@ static_library("chrome_cleaner") {
":public",
"//chrome/browser:browser_process",
"//chrome/browser/profiles:profile",
@@ -1227,7 +1228,7 @@ diff --git a/chrome/browser/safe_browsing/chrome_cleaner/BUILD.gn b/chrome/brows
diff --git a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc
--- a/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc
+++ b/chrome/browser/safe_browsing/chrome_cleaner/settings_resetter_win.cc
@@ -193,7 +193,6 @@ PostCleanupSettingsResetter::Delegate::~Delegate() {}
@@ -192,7 +192,6 @@ PostCleanupSettingsResetter::Delegate::~Delegate() {}
void PostCleanupSettingsResetter::Delegate::FetchDefaultSettings(
DefaultSettingsFetcher::SettingsCallback callback) {
@@ -1267,16 +1268,18 @@ diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.h b/
void StartExtractSevenZipFeatures();
void OnSevenZipAnalysisFinished(
const ArchiveAnalyzerResults& archive_results);
@@ -133,13 +122,6 @@ class FileAnalyzer {
scoped_refptr<SandboxedDMGAnalyzer> dmg_analyzer_;
@@ -136,15 +125,6 @@ class FileAnalyzer {
dmg_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
- scoped_refptr<SandboxedDocumentAnalyzer> document_analyzer_;
- std::unique_ptr<SandboxedDocumentAnalyzer, base::OnTaskRunnerDeleter>
- document_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
- base::TimeTicks document_analysis_start_time_;
-#endif
-
- scoped_refptr<SandboxedSevenZipAnalyzer> seven_zip_analyzer_;
- std::unique_ptr<SandboxedSevenZipAnalyzer, base::OnTaskRunnerDeleter>
- seven_zip_analyzer_{nullptr, base::OnTaskRunnerDeleter(nullptr)};
-
base::WeakPtrFactory<FileAnalyzer> weakptr_factory_{this};
};
@@ -1336,7 +1339,7 @@ diff --git a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc b/chrom
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -423,7 +423,6 @@ static_library("ui") {
@@ -424,7 +424,6 @@ static_library("ui") {
"//chrome/browser/resources/net_internals:resources",
"//chrome/browser/resources/omnibox:resources",
"//chrome/browser/resources/usb_internals:resources",
@@ -1344,7 +1347,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"//chrome/browser/share",
"//chrome/browser/ui/webui:configs",
"//chrome/browser/ui/webui/omnibox:mojo_bindings",
@@ -676,7 +675,6 @@ static_library("ui") {
@@ -680,7 +679,6 @@ static_library("ui") {
# TODO(crbug.com/1158905): Remove this circular dependency.
"//chrome/browser/devtools",
"//chrome/browser/favicon",
@@ -1352,7 +1355,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"//chrome/browser/profiling_host",
"//chrome/browser/ui/webui:configs",
]
@@ -1780,8 +1778,6 @@ static_library("ui") {
@@ -1793,8 +1791,6 @@ static_library("ui") {
"//chrome/browser/resources/identity_internals:resources",
"//chrome/browser/resources/support_tool:resources",
"//chrome/browser/resources/web_app_internals:resources",
@@ -1361,7 +1364,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"//chrome/browser/support_tool:support_tool_proto",
"//chrome/browser/ui/color:color_headers",
"//chrome/browser/ui/color:mixers",
@@ -3625,8 +3621,6 @@ static_library("ui") {
@@ -3654,8 +3650,6 @@ static_library("ui") {
"views/profiles/profile_picker_force_signin_dialog_host.h",
"views/profiles/profile_picker_signed_in_flow_controller.cc",
"views/profiles/profile_picker_signed_in_flow_controller.h",
@@ -1675,26 +1678,32 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/
diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui/intro/intro_ui.cc
--- a/chrome/browser/ui/webui/intro/intro_ui.cc
+++ b/chrome/browser/ui/webui/intro/intro_ui.cc
@@ -12,14 +12,14 @@
#include "chrome/browser/ui/webui/webui_util.h"
#include "chrome/common/webui_url_constants.h"
@@ -24,8 +24,6 @@
#include "chrome/grit/chrome_unscaled_resources.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
-#include "chrome/grit/intro_resources.h"
-#include "chrome/grit/intro_resources_map.h"
#include "chrome/grit/signin_resources.h"
#include "components/signin/public/base/consent_level.h"
#include "components/signin/public/base/signin_buildflags.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui_data_source.h"
@@ -37,6 +35,13 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/l10n/l10n_util.h"
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
+#include "chrome/grit/intro_resources.h"
+#include "chrome/grit/intro_resources_map.h"
#include "chrome/grit/chromium_strings.h"
#include "chrome/grit/generated_resources.h"
#endif
@@ -52,9 +52,11 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
web_ui->GetWebContents()->GetBrowserContext(),
chrome::kChromeUIIntroHost);
+#include "chrome/grit/chromium_strings.h"
+#include "chrome/grit/generated_resources.h"
+#endif
+
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);
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
webui::SetupWebUIDataSource(
@@ -1702,8 +1711,8 @@ diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui
IDR_INTRO_INTRO_HTML);
+#endif
AddStrings(source);
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
int title_id = 0;
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
@@ -1737,7 +1746,7 @@ diff --git a/chrome/browser/webshare/share_service_impl.cc b/chrome/browser/webs
diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
--- a/chrome/chrome_paks.gni
+++ b/chrome/chrome_paks.gni
@@ -410,12 +410,10 @@ template("chrome_extra_paks") {
@@ -420,12 +420,10 @@ template("chrome_extra_paks") {
}
if (!is_android && !is_chromeos_ash) {
sources += [
@@ -1753,26 +1762,26 @@ diff --git a/chrome/chrome_paks.gni b/chrome/chrome_paks.gni
diff --git a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc b/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc
--- a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc
+++ b/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc
@@ -27,11 +27,6 @@ SandboxedRarAnalyzer::SandboxedRarAnalyzer(
@@ -95,11 +95,6 @@ SandboxedRarAnalyzer::SandboxedRarAnalyzer(
service_(std::move(service)) {
DCHECK(callback_);
DCHECK(!file_path_.value().empty());
- service_->BindSafeArchiveAnalyzer(
- remote_analyzer_.BindNewPipeAndPassReceiver());
- remote_analyzer_.set_disconnect_handler(base::BindOnce(
- &SandboxedRarAnalyzer::AnalyzeFileDone, base::Unretained(this),
- safe_browsing::ArchiveAnalyzerResults()));
- remote_analyzer_.set_disconnect_handler(
- base::BindOnce(&SandboxedRarAnalyzer::AnalyzeFileDone, GetWeakPtr(),
- safe_browsing::ArchiveAnalyzerResults()));
}
void SandboxedRarAnalyzer::Start() {
@@ -49,19 +44,12 @@ SandboxedRarAnalyzer::~SandboxedRarAnalyzer() = default;
@@ -121,19 +116,12 @@ SandboxedRarAnalyzer::~SandboxedRarAnalyzer() = default;
void SandboxedRarAnalyzer::AnalyzeFile(base::File file, base::File temp_file) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(!file_path_.value().empty());
- if (remote_analyzer_) {
- remote_analyzer_->AnalyzeRarFile(
- std::move(file), std::move(temp_file),
- base::BindOnce(&SandboxedRarAnalyzer::AnalyzeFileDone, this));
- base::BindOnce(&SandboxedRarAnalyzer::AnalyzeFileDone, GetWeakPtr()));
- } else {
AnalyzeFileDone(safe_browsing::ArchiveAnalyzerResults());
- }
@@ -1785,7 +1794,7 @@ diff --git a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc b/ch
if (callback_) {
std::move(callback_).Run(results);
}
@@ -116,9 +104,7 @@ void SandboxedRarAnalyzer::ReportFileFailure(
@@ -150,9 +138,7 @@ void SandboxedRarAnalyzer::ReportFileFailure(
}
std::string SandboxedRarAnalyzer::DebugString() const {
@@ -1799,22 +1808,22 @@ diff --git a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc b/ch
diff --git a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h b/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h
--- a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h
+++ b/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.h
@@ -9,7 +9,6 @@
#include "base/functional/callback.h"
#include "base/memory/ref_counted_delete_on_sequence.h"
@@ -11,7 +11,6 @@
#include "base/memory/weak_ptr.h"
#include "base/task/sequenced_task_runner.h"
#include "chrome/services/file_util/public/mojom/file_util_service.mojom.h"
-#include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -68,7 +67,6 @@ class SandboxedRarAnalyzer
@@ -73,7 +72,6 @@ class SandboxedRarAnalyzer {
// Remote interfaces to the file util service. Only used from the UI thread.
mojo::Remote<chrome::mojom::FileUtilService> service_;
- mojo::Remote<chrome::mojom::SafeArchiveAnalyzer> remote_analyzer_;
};
std::ostream& operator<<(std::ostream& os,
base::WeakPtrFactory<SandboxedRarAnalyzer> weak_ptr_factory_{this};
};
diff --git a/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h b/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h
--- a/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h
+++ b/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h
@@ -1826,18 +1835,18 @@ diff --git a/chrome/services/file_util/public/cpp/sandboxed_zip_analyzer.h b/chr
#include "mojo/public/cpp/bindings/pending_remote.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -65,7 +64,6 @@ class SandboxedZipAnalyzer
@@ -68,7 +67,6 @@ class SandboxedZipAnalyzer {
// Remote interfaces to the file util service. Only used from the UI thread.
mojo::Remote<chrome::mojom::FileUtilService> service_;
- mojo::Remote<chrome::mojom::SafeArchiveAnalyzer> remote_analyzer_;
};
#endif // CHROME_SERVICES_FILE_UTIL_PUBLIC_CPP_SANDBOXED_ZIP_ANALYZER_H_
base::WeakPtrFactory<SandboxedZipAnalyzer> weak_ptr_factory_{this};
};
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -247,7 +247,6 @@ static_library("test_support") {
@@ -297,7 +297,6 @@ static_library("test_support") {
"//chrome:strings",
"//chrome/browser:browser_process",
"//chrome/browser:test_support",
@@ -1845,15 +1854,15 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//chrome/browser/sharing/proto",
"//chrome/child",
"//chrome/common:non_code_constants",
@@ -1268,7 +1267,6 @@ if (!is_android) {
@@ -1326,7 +1325,6 @@ if (!is_android) {
"//chrome/browser/resource_coordinator:mojo_bindings",
"//chrome/browser/resource_coordinator:tab_manager_features",
"//chrome/browser/resource_coordinator:tab_metrics_event_proto",
"//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/ui/color:color_headers",
@@ -5841,9 +5839,6 @@ test("unit_tests") {
"//chrome/browser/storage_access_api:permissions",
@@ -5935,9 +5933,6 @@ test("unit_tests") {
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/profiling_host",
"//chrome/browser/push_messaging:budget_proto",
@@ -1877,7 +1886,7 @@ diff --git a/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
@@ -219,7 +219,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
@@ -221,7 +221,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterIntegerPref(prefs::kPasswordProtectionWarningTrigger,
PASSWORD_PROTECTION_OFF);
registry->RegisterInt64Pref(prefs::kAdvancedProtectionLastRefreshInUs, 0);
build/patches/Disable-safe-browsing.patch
+227 -243
View File
File diff suppressed because it is too large Load Diff
build/patches/Remove-binary-blob-integrations.patch
+116 -68
View File
@@ -25,8 +25,8 @@ Parts of this patch were developed by csagan5, uazo and others.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
...em_webview_bundle.AndroidManifest.expected | 5 -
chrome/android/BUILD.gn | 45 +-
chrome/android/chrome_java_sources.gni | 5 -
chrome/android/BUILD.gn | 47 +-
chrome/android/chrome_java_sources.gni | 6 -
.../features/cablev2_authenticator/BUILD.gn | 2 -
chrome/android/java/AndroidManifest.xml | 53 --
.../java/res/xml/privacy_preferences.xml | 5 -
@@ -41,7 +41,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../settings/PasswordSettings.java | 9 -
.../modules/chrome_feature_modules.gni | 3 -
chrome/browser/BUILD.gn | 2 -
chrome/browser/language/android/BUILD.gn | 2 -
chrome/browser/language/android/BUILD.gn | 3 -
.../language/AppLanguagePromoDialog.java | 23 -
.../AppLanguagePreferenceDelegate.java | 8 -
.../language/settings/LanguageSettings.java | 6 -
@@ -74,7 +74,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../caf/BaseSessionController.java | 100 +---
.../caf/CafBaseMediaRouteProvider.java | 103 +---
.../caf/CafMediaRouteProvider.java | 16 -
.../media_router/caf/CafMessageHandler.java | 97 +---
.../media_router/caf/CafMessageHandler.java | 97 +--
.../media_router/caf/CastMediaSource.java | 10 +-
.../media_router/caf/CastOptionsProvider.java | 22 +-
.../caf/CastSessionController.java | 84 ---
@@ -85,7 +85,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../caf/remoting/RemotingMediaSource.java | 8 +-
.../remoting/RemotingSessionController.java | 26 -
.../test/android/cast_emulator/BUILD.gn | 1 -
components/module_installer/android/BUILD.gn | 2 -
components/module_installer/android/BUILD.gn | 4 -
components/signin/public/android/BUILD.gn | 3 -
.../signin/AccountRenameChecker.java | 16 -
components/webauthn/android/BUILD.gn | 9 -
@@ -100,18 +100,19 @@ 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 | 539 +-----------------
third_party/android_deps/BUILD.gn | 559 +-----------------
.../preconditions/javatests/BUILD.gn | 1 -
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
79 files changed, 93 insertions(+), 1932 deletions(-)
weblayer/browser/java/BUILD.gn | 1 -
80 files changed, 93 insertions(+), 1959 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
+++ b/android_webview/expectations/system_webview_bundle.AndroidManifest.expected
@@ -19,10 +19,6 @@
@@ -20,10 +20,6 @@
android:icon="@$PACKAGE:drawable/icon_webview"
android:label="Android System WebView"
android:multiArch="true"
android:use32bitAbi="true">
android:multiArch="true">
- <activity # DIFF-ANCHOR: ea1a94af
- android:name="com.google.android.gms.common.api.GoogleApiActivity"
- android:exported="false"
@@ -119,7 +120,7 @@ diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.
</activity> # DIFF-ANCHOR: ea1a94af
<activity # DIFF-ANCHOR: a4438884
android:name="org.chromium.android_webview.devui.MainActivity"
@@ -66,7 +62,6 @@
@@ -67,7 +63,6 @@
android:visibleToInstantApps="true">
</activity-alias> # DIFF-ANCHOR: b7cc06e9
<meta-data android:name="$PACKAGE.WebViewLibrary" android:value="libwebviewchromium.so"/>
@@ -130,7 +131,7 @@ diff --git a/android_webview/expectations/system_webview_bundle.AndroidManifest.
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -357,14 +357,6 @@ if (current_toolchain == default_toolchain) {
@@ -241,14 +241,6 @@ if (current_toolchain == default_toolchain) {
":chrome_public_apk_template_resources",
":update_proto_java",
":usage_stats_proto_java",
@@ -145,7 +146,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:jni_java",
"//cc:cc_java",
"//chrome/android/features/keyboard_accessory:public_java",
@@ -649,8 +641,19 @@ if (current_toolchain == default_toolchain) {
@@ -535,14 +527,23 @@ if (current_toolchain == default_toolchain) {
"//services/shape_detection:shape_detection_java",
"//services/shape_detection/public/mojom:mojom_java",
"//skia/public/mojom:mojom_java",
@@ -162,13 +163,19 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
+ "//base:jni_java",
+
"//third_party/android_deps:chromium_play_services_availability_java",
- "//third_party/android_deps:com_google_android_play_core_java",
"//third_party/android_deps:com_google_code_findbugs_jsr305_java",
"//third_party/android_deps:com_google_guava_listenablefuture_java",
- "//third_party/android_deps:com_google_code_findbugs_jsr305_java",
- "//third_party/android_deps:com_google_guava_listenablefuture_java",
"//third_party/android_deps:dagger_java",
@@ -941,11 +944,6 @@ if (current_toolchain == default_toolchain) {
"//third_party/android_deps:guava_android_java",
"//third_party/android_deps:javax_inject_javax_inject_java",
"//third_party/android_deps:material_design_java",
- "//third_party/android_deps:playcore_java",
"//third_party/android_deps:protobuf_lite_runtime_java",
"//third_party/android_media:android_media_java",
"//third_party/android_swipe_refresh:android_swipe_refresh_java",
@@ -831,11 +832,6 @@ if (current_toolchain == default_toolchain) {
":chrome_java",
":chrome_jni_headers",
":chrome_public_android_manifest",
":delegate_public_impl_java",
- "$google_play_services_package:google_play_services_base_java",
- "$google_play_services_package:google_play_services_basement_java",
@@ -178,7 +185,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java_test_support",
"//base:base_junit_test_support",
"//base/test:test_support_java",
@@ -1477,13 +1475,6 @@ if (current_toolchain == default_toolchain) {
@@ -1382,13 +1378,6 @@ if (current_toolchain == default_toolchain) {
":chrome_app_java_resources",
":chrome_test_util_java",
":delegate_public_impl_java",
@@ -192,7 +199,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:jni_java",
@@ -2392,7 +2383,6 @@ if (current_toolchain == default_toolchain) {
@@ -2317,7 +2306,6 @@ if (current_toolchain == default_toolchain) {
]
deps = [
":chrome_java",
@@ -200,7 +207,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:jni_java",
@@ -2539,7 +2529,6 @@ if (current_toolchain == default_toolchain) {
@@ -2454,7 +2442,6 @@ if (current_toolchain == default_toolchain) {
# is in a DFM.
android_library("base_module_java") {
sources = [
@@ -208,7 +215,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"java/src/org/chromium/chrome/app/TrichromeZygotePreload.java",
"java/src/org/chromium/chrome/browser/ChromeBackgroundService.java",
"java/src/org/chromium/chrome/browser/ChromeBackupAgent.java",
@@ -2555,8 +2544,6 @@ if (current_toolchain == default_toolchain) {
@@ -2470,8 +2457,6 @@ if (current_toolchain == default_toolchain) {
"java/src/org/chromium/chrome/browser/base/SplitCompatBackupAgent.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatContentProvider.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatCustomTabsService.java",
@@ -217,7 +224,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"java/src/org/chromium/chrome/browser/base/SplitCompatIntentService.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatJobService.java",
"java/src/org/chromium/chrome/browser/base/SplitCompatMinidumpUploadJobService.java",
@@ -2581,17 +2568,11 @@ if (current_toolchain == default_toolchain) {
@@ -2496,17 +2481,11 @@ if (current_toolchain == default_toolchain) {
"java/src/org/chromium/chrome/browser/photo_picker/DecoderService.java",
"java/src/org/chromium/chrome/browser/prerender/ChromePrerenderService.java",
"java/src/org/chromium/chrome/browser/provider/ChromeBrowserProvider.java",
@@ -235,15 +242,15 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:jni_java",
"//chrome/browser/download/android:file_provider_java",
@@ -2605,7 +2586,6 @@ if (current_toolchain == default_toolchain) {
@@ -2520,7 +2499,6 @@ if (current_toolchain == default_toolchain) {
"//components/media_router/browser/android:cast_options_provider_java",
"//components/minidump_uploader:minidump_uploader_java",
"//components/module_installer/android:module_installer_java",
- "//third_party/android_deps:com_google_android_play_core_java",
- "//third_party/android_deps:playcore_java",
"//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/androidx:androidx_collection_collection_java",
"//ui/android:ui_no_recycler_view_java",
@@ -2624,7 +2604,6 @@ if (current_toolchain == default_toolchain) {
@@ -2539,7 +2517,6 @@ if (current_toolchain == default_toolchain) {
# Deps to pull services into base module.
# TODO(crbug.com/1126301): Consider moving these to the chrome module to
# reduce base dex size.
@@ -262,10 +269,11 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/org/chromium/chrome/browser/ChromeBackupAgentImpl.java",
"java/src/org/chromium/chrome/browser/ChromeBackupWatcher.java",
"java/src/org/chromium/chrome/browser/ChromeBaseAppCompatActivity.java",
@@ -924,10 +923,6 @@ chrome_java_sources = [
@@ -932,11 +931,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/segmentation_platform/PriceTrackingActionProvider.java",
"java/src/org/chromium/chrome/browser/segmentation_platform/ReaderModeActionProvider.java",
"java/src/org/chromium/chrome/browser/segmentation_platform/SignalAccumulator.java",
- "java/src/org/chromium/chrome/browser/services/gcm/BundleToPersistableBundleConverter.java",
- "java/src/org/chromium/chrome/browser/services/gcm/ChromeGcmListenerServiceImpl.java",
- "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundServiceImpl.java",
- "java/src/org/chromium/chrome/browser/services/gcm/GCMBackgroundTask.java",
@@ -276,10 +284,10 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
diff --git a/chrome/android/features/cablev2_authenticator/BUILD.gn b/chrome/android/features/cablev2_authenticator/BUILD.gn
--- a/chrome/android/features/cablev2_authenticator/BUILD.gn
+++ b/chrome/android/features/cablev2_authenticator/BUILD.gn
@@ -16,8 +16,6 @@ android_library("java") {
@@ -15,8 +15,6 @@ android_library("java") {
deps = [
":java_resources",
":logging_java",
- "$google_play_services_package:google_play_services_base_java",
- "$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
@@ -310,7 +318,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
{% block extra_uses_permissions %}
@@ -752,16 +747,6 @@ by a child template that "extends" this file.
@@ -758,16 +753,6 @@ by a child template that "extends" this file.
</intent-filter>
</activity>
@@ -327,7 +335,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<!-- This activity is used to restart the main Chrome process. Should never be exported. -->
<activity android:name="org.chromium.chrome.browser.BrowserRestartActivity"
android:launchMode="singleInstance"
@@ -769,8 +754,6 @@ by a child template that "extends" this file.
@@ -775,8 +760,6 @@ by a child template that "extends" this file.
android:theme="@style/Theme.BrowserUI.Translucent.NoTitleBar"
android:excludeFromRecents="true"
android:process=":browser_restart_process">
@@ -336,7 +344,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<activity
android:name="org.chromium.chrome.browser.vr.VrCancelAnimationActivity"
android:exported="false"
@@ -953,26 +936,6 @@ by a child template that "extends" this file.
@@ -959,26 +942,6 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false" />
@@ -363,7 +371,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<!-- Android Notification service listener -->
<service android:name="org.chromium.chrome.browser.notifications.NotificationService"
android:exported="false"/>
@@ -1003,20 +966,10 @@ by a child template that "extends" this file.
@@ -1009,20 +972,10 @@ by a child template that "extends" this file.
<service android:name="org.chromium.components.background_task_scheduler.internal.BackgroundTaskJobService"
android:exported="false"
android:permission="android.permission.BIND_JOB_SERVICE"/>
@@ -384,7 +392,7 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<service android:name="org.chromium.chrome.browser.prerender.ChromePrerenderService"
android:exported="true"
tools:ignore="ExportedService" />
@@ -1248,12 +1201,6 @@ by a child template that "extends" this file.
@@ -1254,12 +1207,6 @@ by a child template that "extends" this file.
{% endif %}
@@ -803,7 +811,7 @@ diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/
import("//chrome/android/modules/stack_unwinder/stack_unwinder_module.gni")
import("//chrome/android/modules/test_dummy/test_dummy_module.gni")
import("//device/vr/buildflags/buildflags.gni")
@@ -59,7 +57,6 @@ if (false) { # AR DFM is currently disabled
@@ -56,7 +54,6 @@ if (false) { # AR DFM is currently disabled
if (!disable_tab_ui_dfm) {
monochrome_module_descs += [ tab_ui_module_desc ]
}
@@ -814,7 +822,7 @@ diff --git a/chrome/android/modules/chrome_feature_modules.gni b/chrome/android/
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -7031,8 +7031,6 @@ static_library("browser") {
@@ -7062,8 +7062,6 @@ static_library("browser") {
"offline_pages/offliner_helper.h",
"offline_pages/offliner_user_data.cc",
"offline_pages/offliner_user_data.h",
@@ -826,18 +834,19 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/language/android/BUILD.gn b/chrome/browser/language/android/BUILD.gn
--- a/chrome/browser/language/android/BUILD.gn
+++ b/chrome/browser/language/android/BUILD.gn
@@ -9,14 +9,12 @@ android_library("base_module_java") {
@@ -9,15 +9,12 @@ android_library("base_module_java") {
sources = [
"java/src/org/chromium/chrome/browser/language/AppLocaleUtils.java",
"java/src/org/chromium/chrome/browser/language/GlobalAppLocaleController.java",
- "java/src/org/chromium/chrome/browser/language/LanguageSplitInstaller.java",
]
deps = [
- "$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//chrome/browser/preferences:java",
"//components/language/android:java",
"//components/language/android:ulp_delegate_java",
- "//third_party/android_deps:com_google_android_play_core_java",
- "//third_party/android_deps:playcore_java",
"//third_party/androidx:androidx_annotation_annotation_java",
"//ui/android:ui_no_recycler_view_java",
]
@@ -910,7 +919,7 @@ diff --git a/chrome/browser/language/android/java/src/org/chromium/chrome/browse
import org.chromium.chrome.browser.language.R;
import org.chromium.chrome.browser.preferences.Pref;
import org.chromium.chrome.browser.preferences.PrefChangeRegistrar;
@@ -128,11 +127,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
@@ -136,11 +135,6 @@ public class LanguageSettings extends PreferenceFragmentCompat
* translate target language, and detailed translate preferences.
*/
private void createDetailedPreferences(Bundle savedInstanceState, String rootKey) {
@@ -1103,7 +1112,7 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resourc
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -252,8 +252,6 @@ static_library("ui") {
@@ -253,8 +253,6 @@ static_library("ui") {
"webui/flags/flags_ui.h",
"webui/flags/flags_ui_handler.cc",
"webui/flags/flags_ui_handler.h",
@@ -1112,8 +1121,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"webui/internals/internals_ui.cc",
"webui/internals/internals_ui.h",
"webui/interstitials/interstitial_ui.cc",
@@ -486,7 +484,6 @@ static_library("ui") {
"//components/feedback/content",
@@ -489,7 +487,6 @@ static_library("ui") {
"//components/feedback/redaction_tool",
"//components/find_in_page",
"//components/flags_ui",
- "//components/gcm_driver",
@@ -1140,7 +1149,7 @@ diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/weba
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -44,7 +44,6 @@
@@ -42,7 +42,6 @@
#include "chrome/browser/ui/webui/download_internals/download_internals_ui.h"
#include "chrome/browser/ui/webui/engagement/site_engagement_ui.h"
#include "chrome/browser/ui/webui/flags/flags_ui.h"
@@ -1148,7 +1157,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
#include "chrome/browser/ui/webui/internals/internals_ui.h"
#include "chrome/browser/ui/webui/interstitials/interstitial_ui.h"
#include "chrome/browser/ui/webui/intro/intro_ui.h"
@@ -789,8 +788,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
@@ -803,8 +802,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<FlagsDeprecatedUI>;
if (url.host_piece() == chrome::kChromeUIFlagsHost)
return &NewWebUI<FlagsUI>;
@@ -1160,7 +1169,7 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrom
diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.cc b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
--- a/chrome/browser/webauthn/authenticator_request_dialog_model.cc
+++ b/chrome/browser/webauthn/authenticator_request_dialog_model.cc
@@ -1097,10 +1097,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms(
@@ -1111,10 +1111,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms(
if (cable_ui_type_) {
switch (*cable_ui_type_) {
case AuthenticatorRequestDialogModel::CableUIType::CABLE_V2_2ND_FACTOR:
@@ -1187,7 +1196,7 @@ diff --git a/chrome/browser/webauthn/cablev2_devices.cc b/chrome/browser/webauth
diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
--- a/chrome/test/android/BUILD.gn
+++ b/chrome/test/android/BUILD.gn
@@ -267,8 +267,6 @@ android_library("chrome_java_integration_test_support") {
@@ -254,8 +254,6 @@ android_library("chrome_java_integration_test_support") {
deps = [
":chrome_java_test_support_common",
@@ -1199,7 +1208,7 @@ diff --git a/chrome/test/android/BUILD.gn b/chrome/test/android/BUILD.gn
diff --git a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
--- a/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
+++ b/components/external_intents/android/java/src/org/chromium/components/external_intents/ExternalNavigationHandler.java
@@ -2372,14 +2372,6 @@ public class ExternalNavigationHandler {
@@ -2421,14 +2421,6 @@ public class ExternalNavigationHandler {
* @return Whether the given intent is going to open an Instant App.
*/
private static boolean isIntentToInstantApp(Intent intent) {
@@ -2958,19 +2967,27 @@ diff --git a/components/media_router/test/android/cast_emulator/BUILD.gn b/compo
diff --git a/components/module_installer/android/BUILD.gn b/components/module_installer/android/BUILD.gn
--- a/components/module_installer/android/BUILD.gn
+++ b/components/module_installer/android/BUILD.gn
@@ -35,7 +35,6 @@ android_library("module_installer_java") {
@@ -32,11 +32,9 @@ android_library("module_installer_java") {
]
deps = [
- "$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//base:jni_java",
"//components/crash/android:java",
- "//third_party/android_deps:com_google_android_play_core_java",
- "//third_party/android_deps:playcore_java",
"//third_party/androidx:androidx_annotation_annotation_java",
]
@@ -61,7 +60,6 @@ robolectric_binary("module_installer_junit_tests") {
@@ -59,11 +57,9 @@ robolectric_binary("module_installer_junit_tests") {
]
deps = [
":module_installer_java",
- "$google_play_services_package:google_play_services_tasks_java",
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
- "//third_party/android_deps:com_google_android_play_core_java",
- "//third_party/android_deps:playcore_java",
"//third_party/hamcrest:hamcrest_java",
]
}
@@ -2986,7 +3003,7 @@ diff --git a/components/signin/public/android/BUILD.gn b/components/signin/publi
"//base:base_java",
"//base:jni_java",
"//build/android:build_java",
@@ -172,7 +170,6 @@ robolectric_library("junit") {
@@ -175,7 +173,6 @@ robolectric_library("junit") {
deps = [
":java",
":signin_java_test_support",
@@ -3306,7 +3323,7 @@ diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -3193,10 +3193,6 @@ if (is_android) {
@@ -3236,10 +3236,6 @@ if (is_android) {
testonly = true
sources = content_java_sources_needing_jni
deps = [
@@ -3320,7 +3337,7 @@ diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
diff --git a/device/BUILD.gn b/device/BUILD.gn
--- a/device/BUILD.gn
+++ b/device/BUILD.gn
@@ -474,9 +474,6 @@ if (is_android) {
@@ -476,9 +476,6 @@ if (is_android) {
"gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java",
]
deps = [
@@ -3338,9 +3355,9 @@ diff --git a/device/fido/features.cc b/device/fido/features.cc
BASE_FEATURE(kWebAuthPasskeysUI,
- "WebAuthenticationPasskeysUI",
- base::FEATURE_DISABLED_BY_DEFAULT);
- base::FEATURE_ENABLED_BY_DEFAULT);
+ "WebAuthenticationPasskeysUI", // disabled by default
+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
+ base::FEATURE_ENABLED_BY_DEFAULT); // in Bromite
-BASE_FEATURE(kWebAuthnNoEmptyDisplayNameCBOR,
- "WebAuthenticationNoEmptyDisplayNameCBOR",
@@ -3379,7 +3396,7 @@ diff --git a/services/BUILD.gn b/services/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:base_junit_test_support",
@@ -149,10 +144,6 @@ if (is_android) {
@@ -150,10 +145,6 @@ if (is_android) {
"shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java",
]
deps = [
@@ -3419,7 +3436,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
@@ -54,7 +54,7 @@ if (!limit_android_deps) {
@@ -75,7 +75,7 @@ if (!limit_android_deps) {
android_library("chromium_play_services_availability_java") {
sources = [ "util/org/chromium/gms/ChromiumPlayServicesAvailability.java" ]
@@ -3428,7 +3445,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
}
robolectric_library("chromium_play_services_availability_shadows_java") {
@@ -964,210 +964,6 @@ if (!limit_android_deps) {
@@ -954,210 +954,6 @@ if (!limit_android_deps) {
]
}
@@ -3487,7 +3504,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("google_play_services_basement_java") {
- aar_path = "libs/com_google_android_gms_play_services_basement/play-services-basement-18.0.1.aar"
- aar_path = "libs/com_google_android_gms_play_services_basement/play-services-basement-18.1.0.aar"
- info_path = "libs/com_google_android_gms_play_services_basement/com_google_android_gms_play_services_basement.info"
- deps = [
- "//third_party/androidx:androidx_collection_collection_java",
@@ -3607,7 +3624,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("google_play_services_tasks_java") {
- aar_path = "libs/com_google_android_gms_play_services_tasks/play-services-tasks-18.0.1.aar"
- aar_path = "libs/com_google_android_gms_play_services_tasks/play-services-tasks-18.0.2.aar"
- info_path = "libs/com_google_android_gms_play_services_tasks/com_google_android_gms_play_services_tasks.info"
- deps = [ ":google_play_services_basement_java" ]
- }
@@ -3639,15 +3656,19 @@ 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 =
@@ -1213,60 +1009,6 @@ if (!limit_android_deps) {
@@ -1203,64 +999,6 @@ if (!limit_android_deps) {
]
}
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
- android_aar_prebuilt("com_google_android_play_core_java") {
- aar_path = "libs/com_google_android_play_core/core-1.10.0.aar"
- info_path =
- "libs/com_google_android_play_core/com_google_android_play_core.info"
- android_aar_prebuilt("com_google_android_play_feature_delivery_java") {
- aar_path = "libs/com_google_android_play_feature_delivery/feature-delivery-2.0.1.aar"
- info_path = "libs/com_google_android_play_feature_delivery/com_google_android_play_feature_delivery.info"
- deps = [
- ":com_google_android_play_core_common_java",
- ":google_play_services_basement_java",
- ":google_play_services_tasks_java",
- ]
- }
-
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -3700,7 +3721,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 +1261,6 @@ if (!limit_android_deps) {
@@ -1519,19 +1257,6 @@ if (!limit_android_deps) {
is_robolectric = true
}
@@ -3720,7 +3741,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,272 +1621,6 @@ if (!limit_android_deps) {
@@ -1892,288 +1617,6 @@ if (!limit_android_deps) {
deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
@@ -3829,6 +3850,19 @@ 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_play_core_common_java") {
- aar_path = "libs/com_google_android_play_core_common/core-common-2.0.2.aar"
- info_path = "libs/com_google_android_play_core_common/com_google_android_play_core_common.info"
-
- # To remove visibility constraint, add this dependency to
- # //third_party/android_deps/build.gradle.
- visibility = [
- ":*",
- "//third_party/androidx:*",
- ]
- }
-
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
- java_prebuilt("google_firebase_firebase_annotations_java") {
- jar_path = "libs/com_google_firebase_firebase_annotations/firebase-annotations-16.0.0.jar"
- output_name = "com_google_firebase_firebase_annotations"
@@ -3898,6 +3932,9 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
- "//third_party/androidx:*",
- ]
- deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
-
- # https://crbug.com/1412551
- requires_android = true
- }
-
- # This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
@@ -4037,5 +4074,16 @@ diff --git a/third_party/android_deps/util/org/chromium/gms/ChromiumPlayServices
+ return 16; // API_UNAVAILABLE
}
}
diff --git a/weblayer/browser/java/BUILD.gn b/weblayer/browser/java/BUILD.gn
--- a/weblayer/browser/java/BUILD.gn
+++ b/weblayer/browser/java/BUILD.gn
@@ -96,7 +96,6 @@ android_library("base_module_java") {
]
deps = [
":base_module_interfaces_java",
- "$google_play_services_package:google_play_services_basement_java",
"//base:base_java",
"//base:jni_java",
"//base:process_launcher_java",
--
2.25.1
build/patches/Remove-contextual-search-manager.patch
+52 -52
View File
@@ -53,7 +53,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
@@ -709,7 +709,6 @@ if (current_toolchain == default_toolchain) {
@@ -595,7 +595,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/ui:duplicate_download_enums_java",
"//components/browsing_data/core:browsing_data_utils_java",
"//components/browsing_data/core:clear_browsing_data_tab_java",
@@ -61,7 +61,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//components/dom_distiller/core:distiller_type_java",
"//components/ntp_tiles:ntp_tiles_enums_java",
"//components/offline_pages/core:offline_page_model_enums_java",
@@ -3757,16 +3756,12 @@ generate_jni("chrome_jni_headers") {
@@ -3491,16 +3490,12 @@ generate_jni("chrome_jni_headers") {
"java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelContent.java",
"java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java",
@@ -81,7 +81,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_java_resources.gni
--- a/chrome/android/chrome_java_resources.gni
+++ b/chrome/android/chrome_java_resources.gni
@@ -485,13 +485,6 @@ chrome_java_resources = [
@@ -489,13 +489,6 @@ chrome_java_resources = [
"java/res/layout/context_menu_header.xml",
"java/res/layout/context_menu_row.xml",
"java/res/layout/context_menu_share_row.xml",
@@ -95,7 +95,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
"java/res/layout/custom_tabs_bottombar.xml",
"java/res/layout/custom_tabs_bottombar_item.xml",
"java/res/layout/custom_tabs_control_container.xml",
@@ -635,7 +628,6 @@ chrome_java_resources = [
@@ -639,7 +632,6 @@ chrome_java_resources = [
"java/res/xml/autofill_assistant_preferences.xml",
"java/res/xml/bookmark_widget_info.xml",
"java/res/xml/clear_browsing_data_preferences_tab.xml",
@@ -106,7 +106,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -301,21 +301,6 @@ chrome_java_sources = [
@@ -305,21 +305,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelManager.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelRepaddingTextView.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanelTextViewInflater.java",
@@ -128,7 +128,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabMediator.java",
"java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabObserver.java",
@@ -357,7 +342,6 @@ chrome_java_sources = [
@@ -361,7 +346,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/compositor/overlays/strip/TabLoadTracker.java",
"java/src/org/chromium/chrome/browser/compositor/resources/StaticResourcePreloads.java",
"java/src/org/chromium/chrome/browser/compositor/resources/SystemResourcePreloads.java",
@@ -136,7 +136,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java",
"java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java",
"java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java",
@@ -383,34 +367,6 @@ chrome_java_sources = [
@@ -387,34 +371,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUi.java",
"java/src/org/chromium/chrome/browser/contextmenu/ContextMenuUtils.java",
"java/src/org/chromium/chrome/browser/contextmenu/LensChipDelegate.java",
@@ -182,7 +182,7 @@ diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/ch
import org.chromium.chrome.browser.flags.ChromeFeatureList;
import org.chromium.chrome.browser.fullscreen.FullscreenManager;
import org.chromium.chrome.browser.fullscreen.FullscreenOptions;
@@ -535,14 +534,6 @@ class ManualFillingMediator
@@ -537,14 +536,6 @@ class ManualFillingMediator
private boolean canExtendKeyboard() {
if (!mModel.get(SHOW_WHEN_VISIBLE)) return false;
@@ -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
@@ -43,12 +43,4 @@ found in the LICENSE file.
@@ -41,12 +41,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"/>
@@ -503,7 +503,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/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java
@@ -1715,7 +1715,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -1720,7 +1720,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
return new TabbedRootUiCoordinator(this, this::onOmniboxFocusChanged,
getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier,
mBookmarkModelSupplier, mTabBookmarkerSupplier,
@@ -512,7 +512,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
mStartSurfaceSupplier, mTabSwitcherSupplier, mIntentMetadataOneshotSupplier,
mLayoutStateProviderSupplier, mStartSurfaceParentTabSupplier,
getBrowserControlsManager(), getWindowAndroid(), mJankTracker,
@@ -2825,7 +2825,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -2847,7 +2847,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
// TODO(crbug.com/1157310): Transition this::method refs to dedicated suppliers.
mTabModalHandler = new TabModalLifetimeHandler(this, getLifecycleDispatcher(), manager,
this::getAppBrowserControlsVisibilityDelegate, this::getTabObscuringHandler,
@@ -534,7 +534,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
@@ -255,7 +252,7 @@ import java.util.function.Consumer;
@@ -254,7 +251,7 @@ import java.util.function.Consumer;
*/
public abstract class ChromeActivity<C extends ChromeActivityComponent>
extends AsyncInitializationActivity
@@ -543,7 +543,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
SnackbarManageable, SceneChangeObserver,
StatusBarColorController.StatusBarColorProvider, AppMenuDelegate, AppMenuBlocker,
MenuOrKeyboardActionController, CompositorViewHolder.Initializer,
@@ -322,8 +319,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -321,8 +318,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
new ObservableSupplierImpl<>();
protected final UnownedUserDataSupplier<InsetObserverView> mInsetObserverViewSupplier =
new InsetObserverViewSupplier();
@@ -552,7 +552,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
private SnackbarManager mSnackbarManager;
@@ -512,7 +507,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -511,7 +506,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
// clang-format off
return new RootUiCoordinator(this, null, getShareDelegateSupplier(),
getActivityTabProvider(), mTabModelProfileSupplier, mBookmarkModelSupplier,
@@ -561,7 +561,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
getTabModelSelectorSupplier(), new OneshotSupplierImpl<>(),
new OneshotSupplierImpl<>(), new OneshotSupplierImpl<>(),
new OneshotSupplierImpl<>(), () -> null, mBrowserControlsManagerSupplier.get(),
@@ -949,14 +944,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -948,14 +943,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
mCompositorViewHolderSupplier.get().onNativeLibraryReady(
getWindowAndroid(), getTabContentManager(), getPrefService());
@@ -576,7 +576,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
TraceEvent.end("ChromeActivity:CompositorInitialization");
}
@@ -1417,11 +1404,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1426,11 +1413,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@SuppressLint("NewApi")
@Override
protected final void onDestroy() {
@@ -588,7 +588,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
if (mSnackbarManager != null) {
SnackbarManagerProvider.detach(mSnackbarManager);
}
@@ -1919,13 +1901,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1928,13 +1910,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return mCompositorViewHolderSupplier.get();
}
@@ -602,7 +602,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
/**
* Exits the fullscreen mode, if any. Does nothing if no fullscreen is present.
* @return Whether the fullscreen mode is currently showing.
@@ -1971,15 +1946,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1980,15 +1955,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
}
mActivityTabProvider.setLayoutStateProvider(layoutManager);
@@ -618,7 +618,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
}
/**
@@ -2249,18 +2215,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -2260,18 +2226,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return webContents != null ? SelectionPopupController.fromWebContents(webContents) : null;
}
@@ -672,7 +672,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java
@@ -156,7 +156,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab
@@ -158,7 +158,7 @@ public abstract class BaseCustomTabActivity extends ChromeActivity<BaseCustomTab
mBaseCustomTabRootUiCoordinator = new BaseCustomTabRootUiCoordinator(this,
getShareDelegateSupplier(), getActivityTabProvider(), mTabModelProfileSupplier,
mBookmarkModelSupplier, mTabBookmarkerSupplier,
@@ -837,7 +837,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Tab
mTabModelSelectorSupplier = tabModelSelectorSupplier;
mBackPressManager = backPressManager;
if (BackPressManager.isEnabled()) {
@@ -179,7 +176,7 @@ public class TabModalLifetimeHandler implements NativeInitObserver, DestroyObser
@@ -180,7 +177,7 @@ public class TabModalLifetimeHandler implements NativeInitObserver, DestroyObser
assert mBrowserControlsVisibilityManagerSupplier.hasValue();
assert mFullscreenManagerSupplier.hasValue();
mPresenter = new ChromeTabModalPresenter(mActivity, mTabObscuringHandlerSupplier,
@@ -849,7 +849,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Tab
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
@@ -47,7 +47,6 @@ import org.chromium.ui.text.SpanApplier;
@@ -46,7 +46,6 @@ import org.chromium.ui.text.SpanApplier;
import androidx.annotation.Nullable;
import androidx.preference.PreferenceCategory;
@@ -857,7 +857,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
@@ -70,9 +69,7 @@ public class PrivacySettings
@@ -69,9 +68,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());
@@ -131,12 +128,6 @@ public class PrivacySettings
@@ -128,12 +125,6 @@ public class PrivacySettings
mSearchSuggestions.setOnPreferenceChangeListener(this);
mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
@@ -891,8 +891,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabHelpers.
import org.chromium.chrome.browser.crypto.CipherFactory;
import org.chromium.chrome.browser.dom_distiller.ReaderModeManager;
import org.chromium.chrome.browser.dom_distiller.TabDistillabilityProvider;
@@ -32,7 +31,6 @@ public final class TabHelpers {
TabUma.createForTab(tab);
@@ -33,7 +32,6 @@ public final class TabHelpers {
TabStateAttributes.createForTab(tab, ((TabImpl) tab).getCreationState());
TabDistillabilityProvider.createForTab(tab);
InterceptNavigationDelegateTabHelper.createForTab(tab);
- ContextualSearchTabHelper.createForTab(tab);
@@ -910,7 +910,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
import org.chromium.chrome.browser.desktop_site.DesktopSiteSettingsIPHController;
import org.chromium.chrome.browser.feature_guide.notifications.FeatureNotificationUtils;
import org.chromium.chrome.browser.feature_guide.notifications.FeatureType;
@@ -268,7 +267,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -267,7 +266,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@NonNull ObservableSupplier<Profile> profileSupplier,
@NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier,
@NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
@@ -919,7 +919,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
@NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
@NonNull OneshotSupplier<StartSurface> startSurfaceSupplier,
@NonNull OneshotSupplier<TabSwitcher> tabSwitcherSupplier,
@@ -303,7 +302,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -302,7 +301,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
boolean initializeUiWithIncognitoColors, @NonNull BackPressManager backPressManager) {
super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider,
profileSupplier, bookmarkModelSupplier, tabBookmarkerSupplier,
@@ -992,7 +992,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
if (mAdaptiveToolbarButtonController != null) {
mAdaptiveToolbarButtonController.destroy();
mAdaptiveToolbarButtonController = null;
@@ -968,15 +958,6 @@ public class RootUiCoordinator
@@ -971,15 +961,6 @@ public class RootUiCoordinator
@Override
public boolean canShowAppMenu() {
@@ -1008,7 +1008,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
// Do not show the menu if we are in find in page view.
if (mFindToolbarManager != null && mFindToolbarManager.isShowing()
&& !DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {
@@ -1131,11 +1112,6 @@ public class RootUiCoordinator
@@ -1134,11 +1115,6 @@ public class RootUiCoordinator
AdaptiveToolbarButtonVariant.PRICE_TRACKING, priceTrackingButtonController);
adaptiveToolbarButtonController.addButtonVariant(
AdaptiveToolbarButtonVariant.READER_MODE, readerModeToolbarButtonController);
@@ -1020,7 +1020,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
mButtonDataProviders =
Arrays.asList(mIdentityDiscController, adaptiveToolbarButtonController);
@@ -1204,10 +1180,6 @@ public class RootUiCoordinator
@@ -1207,10 +1183,6 @@ public class RootUiCoordinator
public void onStartedShowing(int layoutType, boolean showToolbar) {
if (layoutType != LayoutType.BROWSING
&& layoutType != LayoutType.SIMPLE_ANIMATION) {
@@ -1031,7 +1031,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
}
if (layoutType == LayoutType.TAB_SWITCHER) {
@@ -1328,10 +1300,6 @@ public class RootUiCoordinator
@@ -1331,10 +1303,6 @@ public class RootUiCoordinator
* cross-feature interaction, e.g. hide other features when this feature is shown.
*/
protected void onFindToolbarShown() {
@@ -1042,7 +1042,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
}
/**
@@ -1488,9 +1456,6 @@ public class RootUiCoordinator
@@ -1491,9 +1459,6 @@ public class RootUiCoordinator
case SheetState.FULL:
if (!mOpened) {
mOpened = true;
@@ -1052,7 +1052,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
}
// On visible bottom sheet, hide page zoom dialog
@@ -1498,8 +1463,6 @@ public class RootUiCoordinator
@@ -1501,8 +1466,6 @@ public class RootUiCoordinator
break;
case SheetState.HIDDEN:
mOpened = false;
@@ -1064,7 +1064,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2080,7 +2080,6 @@ static_library("browser") {
@@ -2092,7 +2092,6 @@ static_library("browser") {
"//components/content_settings/common:mojom",
"//components/content_settings/core/browser",
"//components/content_settings/core/common",
@@ -1072,7 +1072,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/cookie_config",
"//components/country_codes",
"//components/crash/core/browser",
@@ -2561,8 +2560,6 @@ static_library("browser") {
@@ -2576,8 +2575,6 @@ static_library("browser") {
"android/compositor/decoration_title.h",
"android/compositor/layer/content_layer.cc",
"android/compositor/layer/content_layer.h",
@@ -1081,7 +1081,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"android/compositor/layer/layer.h",
"android/compositor/layer/overlay_panel_layer.cc",
"android/compositor/layer/overlay_panel_layer.h",
@@ -2583,8 +2580,6 @@ static_library("browser") {
@@ -2598,8 +2595,6 @@ static_library("browser") {
"android/compositor/resources/resource_factory.cc",
"android/compositor/resources/toolbar_resource.cc",
"android/compositor/resources/toolbar_resource.h",
@@ -1090,7 +1090,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"android/compositor/scene_layer/overscroll_scene_layer.cc",
"android/compositor/scene_layer/overscroll_scene_layer.h",
"android/compositor/scene_layer/scrolling_bottom_view_scene_layer.cc",
@@ -2607,16 +2602,6 @@ static_library("browser") {
@@ -2622,16 +2617,6 @@ static_library("browser") {
"android/content/content_utils.cc",
"android/context_menu/context_menu_native_delegate_impl.cc",
"android/context_menu/context_menu_native_delegate_impl.h",
@@ -1107,7 +1107,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"android/cookies/cookies_fetcher_util.cc",
"android/customtabs/chrome_origin_verifier.cc",
"android/customtabs/chrome_origin_verifier.h",
@@ -3170,8 +3155,6 @@ static_library("browser") {
@@ -3186,8 +3171,6 @@ static_library("browser") {
"safe_browsing/android/safe_browsing_referring_app_bridge_android.h",
"safe_browsing/android/safe_browsing_settings_launcher_android.cc",
"safe_browsing/android/safe_browsing_settings_launcher_android.h",
@@ -1119,7 +1119,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1913,27 +1913,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesUiVariations[] = {
@@ -1982,27 +1982,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesUiVariations[] = {
{"verbose", &kRelatedSearchesUiVerbose, 1, nullptr},
{"extreme", &kRelatedSearchesUiExtreme, 1, nullptr},
};
@@ -1147,7 +1147,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
#endif // BUILDFLAG(IS_ANDROID)
const FeatureEntry::FeatureParam kResamplingInputEventsLSQEnabled[] = {
@@ -3322,18 +3301,6 @@ const FeatureEntry kFeatureEntries[] = {
@@ -3343,18 +3322,6 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableOskResizesVisualViewportByDefaultDescription,
kOsAndroid,
FEATURE_VALUE_TYPE(blink::features::kOSKResizesVisualViewportByDefault)},
@@ -1169,7 +1169,7 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc
--- a/chrome/browser/flags/android/chrome_feature_list.cc
+++ b/chrome/browser/flags/android/chrome_feature_list.cc
@@ -34,7 +34,6 @@
@@ -35,7 +35,6 @@
#include "components/commerce/core/commerce_feature_list.h"
#include "components/content_creation/notes/core/note_features.h"
#include "components/content_settings/core/common/features.h"
@@ -1177,7 +1177,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
#include "components/download/public/common/download_features.h"
#include "components/embedder_support/android/util/cdn_utils.h"
#include "components/feature_engagement/public/feature_list.h"
@@ -218,11 +217,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -220,11 +219,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kContextMenuSearchAndShopWithGoogleLens,
&kContextMenuTranslateWithGoogleLens,
&kContextMenuPopupForAllScreenSizes,
@@ -1187,9 +1187,9 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
- &kContextualSearchSuppressShortView,
- &kContextualSearchThinWebViewImplementation,
&kDeferKeepScreenOnDuringGesture,
&kDeferNotifyInMotion,
&kExperimentsForAgsa,
&kExploreSites,
@@ -675,26 +669,6 @@ BASE_FEATURE(kLensOnQuickActionSearchWidget,
@@ -685,26 +679,6 @@ BASE_FEATURE(kLensOnQuickActionSearchWidget,
"LensOnQuickActionSearchWidget",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1216,7 +1216,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
BASE_FEATURE(kDeferKeepScreenOnDuringGesture,
"DeferKeepScreenOnDuringGesture",
base::FEATURE_DISABLED_BY_DEFAULT);
@@ -706,7 +680,6 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
@@ -720,7 +694,6 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
BASE_FEATURE(kDownloadHomeForExternalApp,
"DownloadHomeForExternalApp",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1237,12 +1237,12 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
-BASE_DECLARE_FEATURE(kContextualSearchSuppressShortView);
-BASE_DECLARE_FEATURE(kContextualSearchThinWebViewImplementation);
BASE_DECLARE_FEATURE(kDeferKeepScreenOnDuringGesture);
BASE_DECLARE_FEATURE(kDeferNotifyInMotion);
BASE_DECLARE_FEATURE(kDontPrefetchLibraries);
BASE_DECLARE_FEATURE(kDownloadAutoResumptionThrottling);
diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
--- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
+++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc
@@ -123,7 +123,6 @@
@@ -121,7 +121,6 @@
#if BUILDFLAG(IS_ANDROID)
#include "chrome/browser/first_run/android/first_run_prefs.h"
#include "chrome/browser/lens/android/lens_prefs.h"
@@ -1250,7 +1250,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
#else // BUILDFLAG(IS_ANDROID)
#include "chrome/browser/download/default_download_dir_policy_handler.h"
#include "chrome/browser/download/download_auto_open_policy_handler.h"
@@ -1911,10 +1910,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
@@ -1937,10 +1936,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
// Policies for all platforms - End
@@ -1299,7 +1299,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<message name="IDS_DO_NOT_TRACK_TITLE" desc="Title for 'Do Not Track' preference">
“Do Not Track”
</message>
@@ -4105,38 +4078,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -4120,38 +4093,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
Tabs
</message>
@@ -1352,7 +1352,7 @@ diff --git a/content/browser/browser_interface_binders.cc b/content/browser/brow
diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn
--- a/third_party/blink/public/mojom/BUILD.gn
+++ b/third_party/blink/public/mojom/BUILD.gn
@@ -1021,8 +1021,8 @@ mojom("android_mojo_bindings") {
@@ -1035,8 +1035,8 @@ mojom("android_mojo_bindings") {
# This Android unhandled-tap feature uses another mojo source, add it in.
if (enable_unhandled_tap) {
sources += [ "unhandled_tap_notifier/unhandled_tap_notifier.mojom" ]
@@ -1373,6 +1373,6 @@ diff --git a/third_party/blink/public/public_features.gni b/third_party/blink/pu
+enable_unhandled_tap = false
# Use Minikin hyphenation engine.
use_minikin_hyphenation = !is_mac
use_minikin_hyphenation = !is_apple
--
2.25.1
build/patches/Remove-price-shopping-commerce-integrations.patch
+221 -165
View File
File diff suppressed because it is too large Load Diff
build/patches/Remove-signin-and-sync-integrations.patch
+305 -262
View File
File diff suppressed because it is too large Load Diff
build/patches/Remove-voice-recognition-integration.patch
+52 -52
View File
@@ -28,7 +28,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -450,8 +450,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -473,8 +473,7 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
// Initialize
// Note that isVoiceSearchEnabled will return false in incognito mode.
@@ -38,7 +38,7 @@ 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);
@@ -1247,10 +1246,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -1317,10 +1316,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
// incorrect state if check synchronously.
ThreadUtils.postOnUiThread(() -> {
if (mOmniboxStub != null) {
@@ -131,15 +131,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/metrics/UmaSess
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java
@@ -55,7 +55,6 @@ import org.chromium.chrome.browser.lifecycle.PauseResumeWithNativeObserver;
import org.chromium.chrome.browser.native_page.ContextMenuManager;
@@ -56,7 +56,6 @@ import org.chromium.chrome.browser.native_page.ContextMenuManager;
import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
import org.chromium.chrome.browser.omnibox.OmniboxStub;
import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteControllerProvider;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileKey;
@@ -107,8 +106,7 @@ import java.util.List;
@@ -109,8 +108,7 @@ import java.util.List;
*/
public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvider,
TemplateUrlServiceObserver,
@@ -149,7 +149,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
private static final String TAG = "NewTabPage";
// Key for the scroll position data that may be stored in a navigation entry.
@@ -140,7 +138,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -142,7 +140,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
protected boolean mSearchProviderHasLogo;
protected OmniboxStub mOmniboxStub;
@@ -157,7 +157,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
// The timestamp at which the constructor was called.
protected final long mConstructedTimeNs;
@@ -219,8 +216,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -222,8 +219,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@Override
public boolean isVoiceSearchEnabled() {
@@ -167,7 +167,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
}
@Override
@@ -228,21 +224,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -231,21 +227,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
if (mIsDestroyed) return;
FeedReliabilityLogger feedReliabilityLogger =
mFeedSurfaceProvider.getReliabilityLogger();
@@ -189,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
}
@Override
@@ -739,12 +720,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -744,12 +725,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
mOmniboxStub.addUrlFocusChangeListener(feedReliabilityLogger);
}
}
@@ -202,7 +202,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
}
@Override
@@ -755,11 +730,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -760,11 +735,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
}
}
@@ -214,7 +214,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
/** Adds an observer to be notified on most visited tile clicks. */
public void addMostVisitedTileClickObserver(MostVisitedTileClickObserver observer) {
mMostVisitedTileClickObservers.addObserver(observer);
@@ -779,9 +749,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -784,9 +754,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
RecordUserAction.record("MobileNTPShown");
mJankTracker.startTrackingScenario(JankScenario.NEW_TAB_PAGE);
SuggestionsMetrics.recordSurfaceVisible();
@@ -224,7 +224,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
}
/** Records UMA for the NTP being hidden and the time spent on it. */
@@ -790,7 +757,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -795,7 +762,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
RecordHistogram.recordMediumTimesHistogram("NewTabPage.TimeSpent",
(System.nanoTime() - mLastShownTimeNs) / TimeUtils.NANOSECONDS_PER_MILLISECOND);
SuggestionsMetrics.recordSurfaceHidden();
@@ -232,7 +232,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
}
/**
@@ -889,9 +855,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -894,9 +860,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
}
mFeedSurfaceProvider.destroy();
mTab.getWindowAndroid().removeContextMenuCloseListener(mContextMenuManager);
@@ -285,11 +285,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/search/Sear
@Override
public void onFinishNativeInitialization() {
- Profile profile = Profile.getLastUsedRegularProfile();
- mAssistantVoiceSearchService = new AssistantVoiceSearchService(mContext,
- ExternalAuthUtils.getInstance(), TemplateUrlServiceFactory.get(),
- ExternalAuthUtils.getInstance(), TemplateUrlServiceFactory.getForProfile(profile),
- GSAState.getInstance(), this, SharedPreferencesManager.getInstance(),
- IdentityServicesProvider.get().getIdentityManager(
- Profile.getLastUsedRegularProfile()),
- IdentityServicesProvider.get().getIdentityManager(profile),
- AccountManagerFacadeProvider.getInstance());
- onAssistantVoiceSearchServiceChanged();
- }
@@ -339,7 +339,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.Tab;
@@ -355,14 +354,12 @@ public class SearchActivity extends AsyncInitializationActivity
@@ -356,14 +355,12 @@ public class SearchActivity extends AsyncInitializationActivity
// will navigate to Tabbed mode. Investigate whether this can inflate
// the tabbed mode layout in the background instead of CCTs.
CustomTabsConnection.getInstance().warmup(0);
@@ -355,7 +355,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
RecordUserAction.record("SearchWidget.WidgetSelected");
getActivityDelegate().onFinishDeferredInitialization();
@@ -433,8 +430,7 @@ public class SearchActivity extends AsyncInitializationActivity
@@ -434,8 +431,7 @@ public class SearchActivity extends AsyncInitializationActivity
if (isFromQuickActionSearchWidget()) {
recordQuickActionSearchType(searchType);
}
@@ -482,7 +482,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
import org.chromium.chrome.browser.page_info.ChromePageInfo;
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
@@ -2052,11 +2051,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -2045,11 +2044,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return mLocationBar.getOmniboxStub();
}
@@ -524,7 +524,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
mToolbarManager.destroy();
mToolbarManager = null;
}
@@ -1066,19 +1060,11 @@ public class RootUiCoordinator
@@ -1069,19 +1063,11 @@ public class RootUiCoordinator
new VoiceToolbarButtonController.VoiceSearchDelegate() {
@Override
public boolean isVoiceSearchEnabled() {
@@ -545,7 +545,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
}
};
VoiceToolbarButtonController voiceToolbarButtonController =
@@ -1127,13 +1113,6 @@ public class RootUiCoordinator
@@ -1130,13 +1116,6 @@ public class RootUiCoordinator
if (!mSupportsAppMenuSupplier.getAsBoolean()) {
mToolbarManager.getToolbar().disableMenuButton();
}
@@ -562,7 +562,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
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
@@ -127,11 +127,6 @@ android_library("java") {
@@ -129,11 +129,6 @@ android_library("java") {
"java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionView.java",
"java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewBinder.java",
"java/src/org/chromium/chrome/browser/omnibox/suggestions/tail/TailSuggestionViewProperties.java",
@@ -600,7 +600,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarCoordinator.java
@@ -40,7 +40,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownEmbedder;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener;
import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
@@ -608,7 +608,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -372,13 +371,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -381,13 +380,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
return mLocationBarLayout.getSecurityIconView();
}
@@ -622,7 +622,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
@Nullable
@Override
public OmniboxStub getOmniboxStub() {
@@ -663,11 +655,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -672,11 +664,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
// End tablet-specific methods.
@@ -697,21 +697,21 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
mLocationBarDataProvider.removeObserver(this);
mDeferredNativeRunnables.clear();
mUrlFocusChangeListeners.clear();
@@ -322,13 +307,6 @@ class LocationBarMediator
if (templateUrlService != null) {
@@ -321,13 +306,6 @@ class LocationBarMediator
mOmniboxPrerender = new OmniboxPrerender();
mTemplateUrlServiceSupplier.onAvailable((templateUrlService) -> {
templateUrlService.addObserver(this);
}
- mAssistantVoiceSearchServiceSupplier.set(new AssistantVoiceSearchService(mContext,
- ExternalAuthUtils.getInstance(), templateUrlService, GSAState.getInstance(), this,
- SharedPreferencesManager.getInstance(),
- IdentityServicesProvider.get().getIdentityManager(
- Profile.getLastUsedRegularProfile()),
- AccountManagerFacadeProvider.getInstance()));
- onAssistantVoiceSearchServiceChanged();
- mAssistantVoiceSearchServiceSupplier.set(new AssistantVoiceSearchService(mContext,
- ExternalAuthUtils.getInstance(), templateUrlService, GSAState.getInstance(),
- LocationBarMediator.this, SharedPreferencesManager.getInstance(),
- IdentityServicesProvider.get().getIdentityManager(
- Profile.getLastUsedRegularProfile()),
- AccountManagerFacadeProvider.getInstance()));
- onAssistantVoiceSearchServiceChanged();
});
mLocationBarLayout.onFinishNativeInitialization();
setProfile(mProfileSupplier.get());
onPrimaryColorChanged();
@@ -377,17 +355,6 @@ class LocationBarMediator
@@ -378,17 +356,6 @@ class LocationBarMediator
mLocationBarLayout.setUnfocusedWidth(unfocusedWidth);
}
@@ -729,7 +729,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/* package */ void setLensControllerForTesting(LensController lensController) {
mLensController = lensController;
}
@@ -396,11 +363,6 @@ class LocationBarMediator
@@ -397,11 +364,6 @@ class LocationBarMediator
sLastCachedIsLensOnOmniboxEnabled = null;
}
@@ -741,7 +741,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/* package */ void setIsUrlBarFocusedWithoutAnimationsForTesting(
boolean isUrlBarFocusedWithoutAnimations) {
mUrlFocusedWithoutAnimations = isUrlBarFocusedWithoutAnimations;
@@ -600,8 +562,6 @@ class LocationBarMediator
@@ -601,8 +563,6 @@ class LocationBarMediator
mUrlCoordinator.setKeyboardVisibility(false, false);
RecordUserAction.record("MobileOmniboxVoiceSearch");
@@ -750,7 +750,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
}
/** package */ void lensButtonClicked(View view) {
@@ -947,28 +907,6 @@ class LocationBarMediator
@@ -948,28 +908,6 @@ class LocationBarMediator
}
}
@@ -779,7 +779,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/**
* Update visuals to use a correct color scheme depending on the primary color.
*/
@@ -1055,8 +993,7 @@ class LocationBarMediator
@@ -1056,8 +994,7 @@ class LocationBarMediator
private boolean shouldShowMicButton() {
if (shouldShowDeleteButton()) return false;
@@ -789,7 +789,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
return false;
}
boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean();
@@ -1251,9 +1188,6 @@ class LocationBarMediator
@@ -1252,9 +1189,6 @@ class LocationBarMediator
public void onPrimaryColorChanged() {
// This method needs to be called first as it computes |mBrandedColorScheme|.
updateBrandedColorScheme();
@@ -799,7 +799,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
}
@Override
@@ -1325,16 +1259,6 @@ class LocationBarMediator
@@ -1326,16 +1260,6 @@ class LocationBarMediator
}
}
@@ -816,7 +816,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
@Override
public void addUrlFocusChangeListener(UrlFocusChangeListener listener) {
mUrlFocusChangeListeners.addObserver(listener);
@@ -1350,37 +1274,10 @@ class LocationBarMediator
@@ -1351,37 +1275,10 @@ class LocationBarMediator
return mUrlHasFocus;
}
@@ -854,7 +854,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
public void setSearchQuery(String query) {
if (TextUtils.isEmpty(query)) return;
@@ -1399,17 +1296,14 @@ class LocationBarMediator
@@ -1400,17 +1297,14 @@ class LocationBarMediator
mUrlCoordinator.setKeyboardVisibility(true, false);
}
@@ -908,7 +908,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.components.omnibox.AutocompleteMatch;
@@ -249,24 +248,6 @@ public class AutocompleteController {
@@ -258,24 +257,6 @@ public class AutocompleteController {
completedLength, webContents);
}
@@ -933,15 +933,15 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/**
* Updates aqs parameters on the selected match that we will navigate to and returns the
* updated URL.
@@ -371,8 +352,6 @@ public class AutocompleteController {
@@ -367,8 +348,6 @@ public class AutocompleteController {
long nativeAutocompleteControllerAndroid, int matchIndex,
long elapsedTimeSinceInputChange, String newQueryText, String[] newQueryParams);
Tab getMatchingTabForSuggestion(long nativeAutocompleteControllerAndroid, int matchIndex);
- void setVoiceMatches(long nativeAutocompleteControllerAndroid, String[] matches,
- float[] confidenceScores);
/**
* Sends a zero suggest request to the server in order to pre-populate the result cache.
// Destroy supplied instance of the AutocompleteControllerAndroid.
// The instance cannot be used after this call completes.
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteCoordinator.java
@@ -953,7 +953,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.share.ShareDelegate;
import org.chromium.chrome.browser.tab.Tab;
@@ -304,13 +303,6 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
@@ -306,13 +305,6 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
mMediator.onNativeInitialized();
}
@@ -978,7 +978,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.share.ShareDelegate;
import org.chromium.chrome.browser.tab.Tab;
@@ -401,14 +400,6 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
@@ -404,14 +403,6 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
mShouldPreventOmniboxAutocomplete = prevent;
}