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

v113 to be checked

Browse Source
This commit is contained in:
Carmelo Messina
2023-04-27 15:17:21 +02:00
parent e7eecdca5e
commit 5055faface
23 changed files with 26338 additions and 22984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00AdblockPlus.patch
+24782 -20505
View File
File diff suppressed because it is too large Load Diff
build/patches/00Eyeo-Adblock-Remove-Privacy-Issues.patch
+32 -43
View File
@@ -7,7 +7,7 @@ Subject: Eyeo Adblock Remove
chrome/browser/BUILD.gn | 2 -
.../adblock/adblock_content_browser_client.cc | 17 -
.../adblock/adblock_controller_factory.cc | 3 +-
.../adblock_telemetry_service_factory.cc | 138 -
.../adblock_telemetry_service_factory.cc | 127 -
.../adblock_telemetry_service_factory.h | 56 -
.../adblock/subscription_service_factory.cc | 2 +-
...hrome_browser_main_extra_parts_profiles.cc | 2 -
@@ -53,7 +53,7 @@ Subject: Eyeo Adblock Remove
.../blink/renderer/core/css/style_engine.cc | 8 +
.../blink/renderer/core/css/style_engine.h | 1 +
.../renderer/core/exported/web_document.cc | 13 +-
50 files changed, 3290 insertions(+), 1158 deletions(-)
50 files changed, 3290 insertions(+), 1147 deletions(-)
delete mode 100644 chrome/browser/adblock/adblock_telemetry_service_factory.cc
delete mode 100644 chrome/browser/adblock/adblock_telemetry_service_factory.h
rename components/adblock/android/java/res/xml/{adblock_preferences.xml => eyeo_adblock_preferences.xml} (100%)
@@ -133,9 +133,9 @@ diff --git a/chrome/browser/adblock/adblock_content_browser_client.cc b/chrome/b
diff --git a/chrome/browser/adblock/adblock_controller_factory.cc b/chrome/browser/adblock/adblock_controller_factory.cc
--- a/chrome/browser/adblock/adblock_controller_factory.cc
+++ b/chrome/browser/adblock/adblock_controller_factory.cc
@@ -63,8 +63,7 @@ KeyedService* AdblockControllerFactory::BuildServiceInstanceFor(
auto adblock_filtering_configuration =
std::make_unique<PersistentFilteringConfiguration>(prefs, "adblock");
@@ -65,8 +65,7 @@ KeyedService* AdblockControllerFactory::BuildServiceInstanceFor(
std::make_unique<PersistentFilteringConfiguration>(
prefs, kAdblockFilteringConfigurationName);
- if (base::CommandLine::ForCurrentProcess()->HasSwitch(
- adblock::switches::kDisableAcceptableAds)) {
@@ -147,7 +147,7 @@ diff --git a/chrome/browser/adblock/adblock_telemetry_service_factory.cc b/chrom
deleted file mode 100644
--- a/chrome/browser/adblock/adblock_telemetry_service_factory.cc
+++ /dev/null
@@ -1,138 +0,0 @@
@@ -1,127 +0,0 @@
-/*
- * This file is part of eyeo Chromium SDK,
- * Copyright (C) 2006-present eyeo GmbH
@@ -186,7 +186,6 @@ deleted file mode 100644
-namespace {
-std::optional<base::TimeDelta> g_check_interval_for_testing;
-std::optional<base::TimeDelta> g_initial_delay_for_testing;
-constexpr base::StringPiece kAdblockFilteringConfigurationName = "adblock";
-
-base::TimeDelta GetInitialDelay() {
- static base::TimeDelta kInitialDelay =
@@ -202,17 +201,6 @@ deleted file mode 100644
- return kCheckInterval;
-}
-
-FilteringConfiguration* GetAdblockFilteringConfiguration(
- content::BrowserContext* context) {
- auto filtering_configurations =
- SubscriptionServiceFactory::GetForBrowserContext(context)
- ->GetInstalledFilteringConfigurations();
- const auto it = base::ranges::find(filtering_configurations,
- kAdblockFilteringConfigurationName,
- &FilteringConfiguration::GetName);
- DCHECK(it != filtering_configurations.end());
- return *it;
-}
-} // namespace
-
-// static
@@ -249,8 +237,9 @@ deleted file mode 100644
- ->GetURLLoaderFactoryForBrowserProcess();
- auto* prefs = Profile::FromBrowserContext(context)->GetPrefs();
- auto service = std::make_unique<AdblockTelemetryService>(
- GetAdblockFilteringConfiguration(context), url_loader_factory,
- GetInitialDelay(), GetCheckInterval());
- SubscriptionServiceFactory::GetForBrowserContext(context)
- ->GetAdblockFilteringConfiguration(),
- url_loader_factory, GetInitialDelay(), GetCheckInterval());
- service->AddTopicProvider(std::make_unique<ActivepingTelemetryTopicProvider>(
- utils::GetAppInfo(), prefs,
- AdblockControllerFactory::GetForBrowserContext(context),
@@ -362,26 +351,26 @@ diff --git a/chrome/browser/adblock/subscription_service_factory.cc b/chrome/bro
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -16,7 +16,6 @@
@@ -17,7 +17,6 @@
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/accessibility/page_colors_factory.h"
#include "chrome/browser/adblock/adblock_controller_factory.h"
-#include "chrome/browser/adblock/adblock_telemetry_service_factory.h"
#include "chrome/browser/adblock/content_security_policy_injector_factory.h"
#include "chrome/browser/adblock/element_hider_factory.h"
#include "chrome/browser/adblock/resource_classification_runner_factory.h"
#include "chrome/browser/adblock/session_stats_factory.h"
#include "chrome/browser/adblock/sitekey_storage_factory.h"
@@ -584,7 +583,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -637,7 +636,6 @@ void ChromeBrowserMainExtraPartsProfiles::
ExitTypeServiceFactory::GetInstance();
#endif
adblock::AdblockControllerFactory::GetInstance();
- adblock::AdblockTelemetryServiceFactory::GetInstance();
adblock::ContentSecurityPolicyInjectorFactory::GetInstance();
adblock::ElementHiderFactory::GetInstance();
adblock::ResourceClassificationRunnerFactory::GetInstance();
adblock::SessionStatsFactory::GetInstance();
adblock::SitekeyStorageFactory::GetInstance();
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -325,6 +325,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -326,6 +326,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
}
#endif
@@ -393,14 +382,14 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -26,7 +26,6 @@ import("//chrome/test/base/js2gtest.gni")
@@ -27,7 +27,6 @@ import("//chrome/test/base/js2gtest.gni")
import("//chrome/test/include_js_tests.gni")
import("//chrome/version.gni")
import("//chromeos/ash/components/assistant/assistant.gni")
-import("//components/adblock/features.gni")
import("//components/captive_portal/core/features.gni")
import("//components/feed/features.gni")
import("//components/gwp_asan/buildflags/buildflags.gni")
import("//components/lens/features.gni")
diff --git a/components/adblock/android/BUILD.gn b/components/adblock/android/BUILD.gn
--- a/components/adblock/android/BUILD.gn
+++ b/components/adblock/android/BUILD.gn
@@ -1340,7 +1329,7 @@ diff --git a/components/adblock/core/common/adblock_constants.cc b/components/ad
-
const char kAllowlistEverythingFilter[] = "@@*$document";
const char kBlankHtml[] =
const char kAdblockFilteringConfigurationName[] = "adblock";
diff --git a/components/adblock/core/common/adblock_constants.h b/components/adblock/core/common/adblock_constants.h
--- a/components/adblock/core/common/adblock_constants.h
+++ b/components/adblock/core/common/adblock_constants.h
@@ -1350,8 +1339,8 @@ diff --git a/components/adblock/core/common/adblock_constants.h b/components/adb
-extern const char kSiteKeyHeaderKey[];
extern const char kAllowlistEverythingFilter[];
extern const char kAdblockFilteringConfigurationName[];
const std::string& CurrentSchemaVersion();
diff --git a/components/adblock/core/common/adblock_prefs.cc b/components/adblock/core/common/adblock_prefs.cc
--- a/components/adblock/core/common/adblock_prefs.cc
+++ b/components/adblock/core/common/adblock_prefs.cc
@@ -1589,16 +1578,16 @@ diff --git a/components/adblock/core/subscription/ongoing_subscription_request_i
policy_exception_justification: "Not implemented."
})");
@@ -64,7 +77,7 @@ OngoingSubscriptionRequestImpl::OngoingSubscriptionRequestImpl(
@@ -66,7 +79,7 @@ OngoingSubscriptionRequestImpl::OngoingSubscriptionRequestImpl(
OngoingSubscriptionRequestImpl::~OngoingSubscriptionRequestImpl() {
if (!url_.is_empty())
if (!url_.is_empty()) {
- VLOG(1) << "[eyeo] Cancelling download of " << url_;
+ LOG(INFO) << "[eyeo] Cancelling download of " << url_;
}
net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
}
void OngoingSubscriptionRequestImpl::Start(GURL url,
@@ -86,7 +99,7 @@ void OngoingSubscriptionRequestImpl::Retry() {
@@ -92,7 +105,7 @@ void OngoingSubscriptionRequestImpl::Retry() {
return;
}
backoff_entry_->InformOfRequest(false);
@@ -1607,7 +1596,7 @@ diff --git a/components/adblock/core/subscription/ongoing_subscription_request_i
<< backoff_entry_->GetTimeUntilRelease();
retry_timer_->Start(
FROM_HERE, backoff_entry_->GetTimeUntilRelease(),
@@ -100,7 +113,7 @@ void OngoingSubscriptionRequestImpl::Redirect(GURL redirect_url) {
@@ -106,7 +119,7 @@ void OngoingSubscriptionRequestImpl::Redirect(GURL redirect_url) {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
DCHECK(!url_.is_empty()) << "Redirect() called before Start()";
DCHECK(url_ != redirect_url) << "Invalid redirect. Same URL";
@@ -1616,7 +1605,7 @@ diff --git a/components/adblock/core/subscription/ongoing_subscription_request_i
++number_of_redirects_;
url_ = std::move(redirect_url);
StartInternal();
@@ -120,10 +133,14 @@ void OngoingSubscriptionRequestImpl::StartInternal() {
@@ -126,10 +139,14 @@ void OngoingSubscriptionRequestImpl::StartInternal() {
// indefinitely.
return;
}
@@ -1766,7 +1755,7 @@ diff --git a/components/adblock/core/subscription/subscription_persistent_storag
diff --git a/components/adblock/core/subscription/subscription_service_impl.cc b/components/adblock/core/subscription/subscription_service_impl.cc
--- a/components/adblock/core/subscription/subscription_service_impl.cc
+++ b/components/adblock/core/subscription/subscription_service_impl.cc
@@ -113,7 +113,7 @@ void SubscriptionServiceImpl::OnEnabledStateChanged(
@@ -158,7 +158,7 @@ void SubscriptionServiceImpl::OnEnabledStateChanged(
});
DCHECK(it != maintainers_.end()) << "Received OnEnabledStateChanged from "
"unregistered FilteringConfiguration";
@@ -1874,7 +1863,7 @@ deleted file mode 100644
diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn
--- a/components/resources/BUILD.gn
+++ b/components/resources/BUILD.gn
@@ -75,7 +75,6 @@ grit("components_resources") {
@@ -79,7 +79,6 @@ grit("components_resources") {
deps += [
"//components/resources/adblocking:copy_snippets_lib",
@@ -5149,7 +5138,7 @@ new file mode 100755
diff --git a/third_party/blink/renderer/core/css/style_engine.cc b/third_party/blink/renderer/core/css/style_engine.cc
--- a/third_party/blink/renderer/core/css/style_engine.cc
+++ b/third_party/blink/renderer/core/css/style_engine.cc
@@ -539,6 +539,14 @@ void StyleEngine::UpdateActiveStyleSheetsInShadow(
@@ -540,6 +540,14 @@ void StyleEngine::UpdateActiveStyleSheetsInShadow(
}
}
@@ -5178,7 +5167,7 @@ diff --git a/third_party/blink/renderer/core/css/style_engine.h b/third_party/bl
diff --git a/third_party/blink/renderer/core/exported/web_document.cc b/third_party/blink/renderer/core/exported/web_document.cc
--- a/third_party/blink/renderer/core/exported/web_document.cc
+++ b/third_party/blink/renderer/core/exported/web_document.cc
@@ -270,6 +270,16 @@ WebStyleSheetKey WebDocument::InsertAbpElemhideStylesheet(
@@ -274,6 +274,16 @@ WebStyleSheetKey WebDocument::InsertAbpElemhideStylesheet(
Document* document = Unwrap<Document>();
DCHECK(document);
@@ -5195,7 +5184,7 @@ diff --git a/third_party/blink/renderer/core/exported/web_document.cc b/third_pa
auto* parsed_sheet = MakeGarbageCollected<StyleSheetContents>(
MakeGarbageCollected<CSSParserContext>(*document));
parsed_sheet->ParseString(source_code);
@@ -291,9 +301,6 @@ WebStyleSheetKey WebDocument::InsertAbpElemhideStylesheet(
@@ -295,9 +305,6 @@ WebStyleSheetKey WebDocument::InsertAbpElemhideStylesheet(
{SchedulingPolicy::DisableBackForwardCache()});
}
build/patches/00WIN-ADDTO-Disable-safe-browsing.patch
+117 -124
View File
@@ -6,10 +6,10 @@ Subject: WIN ADDTO Disable safe browsing
chrome/browser/BUILD.gn | 16 +-
.../chrome_browsing_data_remover_delegate.cc | 2 -
chrome/browser/chrome_browser_main_win.cc | 6 -
.../bubble/download_bubble_controller.cc | 2 +
.../bubble/download_bubble_ui_controller.cc | 2 +
.../chrome_download_manager_delegate.cc | 16 +-
.../browser/download/download_item_model.cc | 93 +---------
.../analysis/content_analysis_delegate.cc | 164 +-----------------
.../browser/download/download_item_model.cc | 94 +---------
.../analysis/content_analysis_delegate.cc | 162 +-----------------
.../analysis/content_analysis_delegate.h | 7 -
.../analysis/request_handler_base.cc | 20 ---
.../reporting/realtime_reporting_client.cc | 3 +-
@@ -43,10 +43,10 @@ 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 | 33 +---
chrome/browser/ui/webui/intro/intro_ui.cc | 29 +---
chrome/browser/webshare/share_service_impl.cc | 4 +
chrome/chrome_paks.gni | 2 -
.../public/cpp/sandboxed_rar_analyzer.cc | 16 +-
.../public/cpp/sandboxed_rar_analyzer.cc | 19 +-
.../public/cpp/sandboxed_rar_analyzer.h | 2 -
.../public/cpp/sandboxed_zip_analyzer.h | 2 -
chrome/test/BUILD.gn | 4 -
@@ -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, 74 insertions(+), 827 deletions(-)
51 files changed, 72 insertions(+), 827 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1932,10 +1932,6 @@ static_library("browser") {
@@ -1887,10 +1887,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",
@@ -2038,10 +2034,7 @@ static_library("browser") {
@@ -1994,10 +1990,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",
@@ -3657,18 +3650,12 @@ static_library("browser") {
@@ -3622,18 +3615,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",
@@ -7920,7 +7907,6 @@ static_library("test_support") {
@@ -7909,7 +7896,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
@@ -653,8 +653,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -644,8 +644,6 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
base::BindOnce(
&ChromeBrowsingDataRemoverDelegate::CreateTaskCompletionClosure,
base::Unretained(this), TracingDataType::kCookies));
@@ -124,7 +124,7 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -395,12 +395,6 @@ void ShowCloseBrowserFirstMessageBox() {
@@ -333,12 +333,6 @@ void ShowCloseBrowserFirstMessageBox() {
}
void MaybePostSettingsResetPrompt() {
@@ -137,24 +137,25 @@ diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_b
}
// Updates all Progressive Web App launchers in |profile_dir| to the latest
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
@@ -458,8 +458,10 @@ void DownloadBubbleUIController::ProcessDownloadButtonPress(
diff --git a/chrome/browser/download/bubble/download_bubble_ui_controller.cc b/chrome/browser/download/bubble/download_bubble_ui_controller.cc
--- a/chrome/browser/download/bubble/download_bubble_ui_controller.cc
+++ b/chrome/browser/download/bubble/download_bubble_ui_controller.cc
@@ -204,9 +204,11 @@ void DownloadBubbleUIController::ProcessDownloadButtonPress(
commands.ExecuteCommand(command);
break;
case DownloadCommands::REVIEW:
+#if BUILDFLAG(FULL_SAFE_BROWSING)
model->ReviewScanningVerdict(
browser_->tab_strip_model()->GetActiveWebContents());
+#endif
break;
+#endif
case DownloadCommands::RETRY:
RetryDownload(model, command);
break;
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
@@ -880,21 +880,11 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
@@ -884,21 +884,11 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
content::DownloadItemUtils::GetWebContents(download);
Browser* browser =
web_contents ? chrome::FindBrowserWithWebContents(web_contents) : nullptr;
@@ -176,7 +177,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
browser->OpenURL(params);
#endif // BUILDFLAG(IS_ANDROID)
}
@@ -942,7 +932,7 @@ void ChromeDownloadManagerDelegate::ShowDownloadInShell(
@@ -946,7 +936,7 @@ void ChromeDownloadManagerDelegate::ShowDownloadInShell(
std::string
ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
@@ -185,7 +186,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
}
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -1706,8 +1696,8 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAllowed(
@@ -1715,8 +1705,8 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAllowed(
DCHECK(download_item);
DCHECK(download_item->IsSavePackageDownload());
@@ -199,7 +200,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
@@ -900,6 +900,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
@@ -901,6 +901,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
DownloadUIModel::ExecuteCommand(download_commands, command);
break;
case DownloadCommands::DEEP_SCAN:
@@ -207,7 +208,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)
@@ -932,107 +933,17 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
@@ -933,108 +934,17 @@ void DownloadItemModel::ExecuteCommand(DownloadCommands* download_commands,
safe_browsing::DeepScanningRequest::DeepScanTrigger::
TRIGGER_APP_PROMPT,
safe_browsing::DownloadCheckResult::UNKNOWN, std::move(settings));
@@ -230,7 +231,8 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
- l10n_util::GetStringUTF16(
- IDS_DOWNLOAD_BUBBLE_SUBPAGE_SUMMARY_SUSPICIOUS_ARCHIVE))
- .AddIconAndColor(vector_icons::kNotSecureWarningIcon,
- ui::kColorAlertMediumSeverity)
- ui::kColorAlertMediumSeverityIcon)
- .AddSecondaryTextColor(ui::kColorAlertMediumSeverityText)
- .AddPrimaryButton(DownloadCommands::Command::DISCARD)
- .AddSubpageButton(l10n_util::GetStringUTF16(IDS_DOWNLOAD_BUBBLE_DELETE),
- DownloadCommands::Command::DISCARD,
@@ -350,8 +352,8 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
- access_point_, content_size, text_response_, user_justification);
}
if (!warned_file_indices_.empty()) {
@@ -147,12 +132,6 @@ void ContentAnalysisDelegate::BypassWarnings(
// Mark the full image as complying and report a warning bypass.
@@ -158,12 +143,6 @@ void ContentAnalysisDelegate::BypassWarnings(
// Mark the printed page as complying and report a warning bypass.
if (page_warning_) {
result_.page_result = true;
@@ -364,7 +366,7 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
}
RunCallback();
@@ -162,15 +141,6 @@ void ContentAnalysisDelegate::Cancel(bool warning) {
@@ -173,15 +152,6 @@ void ContentAnalysisDelegate::Cancel(bool warning) {
if (callback_.is_null())
return;
@@ -380,7 +382,7 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
// Ask the binary upload service to cancel requests if it can.
auto cancel = std::make_unique<BinaryUploadService::CancelRequests>(
data_.settings.cloud_or_local_settings);
@@ -334,8 +304,7 @@ ContentAnalysisDelegate::ContentAnalysisDelegate(
@@ -345,8 +315,7 @@ ContentAnalysisDelegate::ContentAnalysisDelegate(
CompletionCallback callback,
safe_browsing::DeepScanAccessPoint access_point)
: data_(std::move(data)),
@@ -390,7 +392,7 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
DCHECK(web_contents);
profile_ = Profile::FromBrowserContext(web_contents->GetBrowserContext());
url_ = web_contents->GetLastCommittedURL();
@@ -355,14 +324,6 @@ void ContentAnalysisDelegate::StringRequestCallback(
@@ -367,14 +336,6 @@ void ContentAnalysisDelegate::StringRequestCallback(
if (result == safe_browsing::BinaryUploadService::Result::SUCCESS)
final_actions_[response.request_token()] = GetAckFinalAction(response);
@@ -404,8 +406,8 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
-
text_request_complete_ = true;
RequestHandlerResult request_handler_result =
@@ -375,12 +336,6 @@ void ContentAnalysisDelegate::StringRequestCallback(
string_request_result_ =
@@ -387,12 +348,6 @@ void ContentAnalysisDelegate::StringRequestCallback(
std::fill(result_.text_results.begin(), result_.text_results.end(),
text_complies);
@@ -415,10 +417,10 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
- access_point_, content_size, result, response,
- CalculateEventResult(data_.settings, text_complies, should_warn));
-
UpdateFinalResult(request_handler_result.final_result,
request_handler_result.tag);
UpdateFinalResult(string_request_result_.final_result,
string_request_result_.tag);
@@ -440,11 +395,6 @@ void ContentAnalysisDelegate::PageRequestCallback(
@@ -494,11 +449,6 @@ void ContentAnalysisDelegate::PageRequestCallback(
if (result == safe_browsing::BinaryUploadService::Result::SUCCESS)
final_actions_[response.request_token()] = GetAckFinalAction(response);
@@ -430,7 +432,7 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
page_request_complete_ = true;
RequestHandlerResult request_handler_result =
@@ -454,13 +404,6 @@ void ContentAnalysisDelegate::PageRequestCallback(
@@ -508,13 +458,6 @@ void ContentAnalysisDelegate::PageRequestCallback(
bool should_warn = request_handler_result.final_result ==
FinalContentAnalysisResult::WARNING;
@@ -444,8 +446,8 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
UpdateFinalResult(request_handler_result.final_result,
request_handler_result.tag);
@@ -479,19 +422,7 @@ bool ContentAnalysisDelegate::UploadData() {
PrepareTextRequest();
@@ -535,19 +478,7 @@ bool ContentAnalysisDelegate::UploadData() {
PrepareImageRequest();
PreparePageRequest();
- if (!data_.paths.empty()) {
@@ -465,7 +467,7 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
data_uploaded_ = true;
// Do not add code under this comment. The above line should be the last thing
// this function does before the return statement.
@@ -501,52 +432,9 @@ bool ContentAnalysisDelegate::UploadData() {
@@ -557,34 +488,6 @@ bool ContentAnalysisDelegate::UploadData() {
}
void ContentAnalysisDelegate::PrepareTextRequest() {
@@ -499,6 +501,10 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
- }
}
void ContentAnalysisDelegate::PrepareImageRequest() {
@@ -615,21 +518,6 @@ void ContentAnalysisDelegate::PrepareImageRequest() {
}
void ContentAnalysisDelegate::PreparePageRequest() {
- // The request is considered complete if the mapped region is invalid since it
- // prevents scanning.
@@ -518,7 +524,7 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
}
// This method only prepares requests for print and paste events. File events
@@ -555,31 +443,6 @@ void ContentAnalysisDelegate::PreparePageRequest() {
@@ -638,29 +526,6 @@ void ContentAnalysisDelegate::PreparePageRequest() {
void ContentAnalysisDelegate::PrepareRequest(
enterprise_connectors::AnalysisConnector connector,
BinaryUploadService::Request* request) {
@@ -530,12 +536,10 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
- // Include tab page title, user action id, and count of requests per user
- // action in local content analysis requests.
- if (data_.settings.cloud_or_local_settings.is_local_analysis()) {
- // Increment the total number of user action requests by 1.
- total_requests_count_++;
- request->set_tab_title(title_);
- request->set_user_action_id(user_action_id_);
- // Set request count to 1 for print/paste event. Request count for file
- // events are set in
- // chrome/browser/enterprise/connectors/analysis/request_handler_base.cc
- request->set_user_action_requests_count(1);
- }
-
- request->set_analysis_connector(connector);
@@ -550,7 +554,7 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
}
void ContentAnalysisDelegate::FillAllResultsWith(bool status) {
@@ -589,8 +452,7 @@ void ContentAnalysisDelegate::FillAllResultsWith(bool status) {
@@ -671,8 +536,7 @@ void ContentAnalysisDelegate::FillAllResultsWith(bool status) {
}
BinaryUploadService* ContentAnalysisDelegate::GetBinaryUploadService() {
@@ -560,7 +564,7 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
}
void ContentAnalysisDelegate::UploadTextForDeepScanning(
@@ -664,26 +526,6 @@ void ContentAnalysisDelegate::UpdateFinalResult(
@@ -773,26 +637,6 @@ void ContentAnalysisDelegate::UpdateFinalResult(
}
void ContentAnalysisDelegate::AckAllRequests() {
@@ -590,7 +594,7 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h
--- a/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h
+++ b/chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.h
@@ -343,10 +343,6 @@ class ContentAnalysisDelegate : public ContentAnalysisDelegateBase {
@@ -370,10 +370,6 @@ class ContentAnalysisDelegate : public ContentAnalysisDelegateBase {
bool page_warning_ = false;
enterprise_connectors::ContentAnalysisResponse page_response_;
@@ -598,10 +602,10 @@ diff --git a/chrome/browser/enterprise/connectors/analysis/content_analysis_dele
- // TODO(crbug.com/1324892): Move to PageRequestHandler.
- int64_t page_size_bytes_ = 0;
-
// Set to true once the scan of text has completed. If the scan request has
// no text requiring deep scanning, this is set to true immediately.
bool text_request_complete_ = false;
@@ -366,9 +362,6 @@ class ContentAnalysisDelegate : public ContentAnalysisDelegateBase {
// Stores the total number of requests associated with one user action.
int64_t total_requests_count_ = 0;
@@ -400,9 +396,6 @@ class ContentAnalysisDelegate : public ContentAnalysisDelegateBase {
// Pointer to UI when enabled.
raw_ptr<ContentAnalysisDialog> dialog_ = nullptr;
@@ -644,7 +648,7 @@ 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
@@ -338,6 +338,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp(
@@ -344,6 +344,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp(
const enterprise_connectors::ReportingSettings& settings,
base::Value::Dict event,
const base::Time& time) {
@@ -652,7 +656,7 @@ diff --git a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_c
if (rejected_dm_token_timers_.contains(settings.dm_token)) {
return;
}
@@ -406,7 +407,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp(
@@ -414,7 +415,7 @@ void RealtimeReportingClient::ReportEventWithTimestamp(
}
std::string RealtimeReportingClient::GetProfileUserName() const {
@@ -660,11 +664,11 @@ diff --git a/chrome/browser/enterprise/connectors/reporting/realtime_reporting_c
+ return "";
}
#if BUILDFLAG(IS_CHROMEOS_ASH)
std::string RealtimeReportingClient::GetProfileIdentifier() const {
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
@@ -747,9 +747,6 @@ static_library("extensions") {
@@ -756,9 +756,6 @@ static_library("extensions") {
# TODO(crbug.com/1065748): Remove this circular dependency.
"//chrome/browser/web_applications/extensions",
@@ -674,7 +678,7 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUIL
]
# Since browser and browser_extensions actually depend on each other,
@@ -801,8 +798,6 @@ static_library("extensions") {
@@ -811,8 +808,6 @@ static_library("extensions") {
"//chrome/browser/profiles:profile",
"//chrome/browser/resource_coordinator:intervention_policy_database_proto",
"//chrome/browser/resource_coordinator:mojo_bindings",
@@ -727,10 +731,10 @@ diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/brows
- extension_id(), parsed_args_->details.domain.value_or(std::string()),
- parsed_args_->details.name.value_or(std::string()),
- parsed_args_->details.path.value_or(std::string()),
- parsed_args_->details.secure.value_or(false),
- parsed_args_->details.secure,
- parsed_args_->details.store_id.value_or(std::string()),
- parsed_args_->details.url.value_or(std::string()),
- parsed_args_->details.session.value_or(false));
- parsed_args_->details.session);
- telemetry_service->AddSignal(std::move(cookies_get_all_signal));
}
@@ -738,7 +742,7 @@ diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/brows
diff --git a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
--- a/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
+++ b/chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc
@@ -55,8 +55,7 @@ SafeBrowsingPrivateGetReferrerChainFunction::Run() {
@@ -54,8 +54,7 @@ SafeBrowsingPrivateGetReferrerChainFunction::Run() {
}
Profile* profile = Profile::FromBrowserContext(browser_context());
@@ -882,7 +886,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
@@ -721,18 +721,6 @@ void WebstorePrivateBeginInstallWithManifest3Function::OnFrictionPromptDone(
@@ -719,18 +719,6 @@ void WebstorePrivateBeginInstallWithManifest3Function::OnFrictionPromptDone(
void WebstorePrivateBeginInstallWithManifest3Function::
ReportFrictionAcceptedEvent() {
@@ -901,7 +905,7 @@ diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api
}
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
@@ -1219,8 +1207,7 @@ WebstorePrivateGetReferrerChainFunction::
@@ -1227,8 +1215,7 @@ WebstorePrivateGetReferrerChainFunction::
ExtensionFunction::ResponseAction
WebstorePrivateGetReferrerChainFunction::Run() {
Profile* profile = Profile::FromBrowserContext(browser_context());
@@ -1017,7 +1021,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
@@ -122,7 +122,6 @@ void DisplayMediaAccessHandler::HandleRequest(
@@ -136,7 +136,6 @@ void DisplayMediaAccessHandler::HandleRequest(
blink::mojom::StreamDevicesSet(),
blink::mojom::MediaStreamRequestResult::PERMISSION_DENIED,
/*ui=*/nullptr);
@@ -1098,7 +1102,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>&
@@ -906,7 +906,7 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
@@ -901,7 +901,7 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
bool password_field_exists,
uint64_t reused_password_hash,
const std::string& domain) {
@@ -1107,7 +1111,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;
@@ -946,7 +946,18 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
@@ -941,7 +941,18 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
}
@@ -1130,7 +1134,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
@@ -1986,13 +1986,6 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
@@ -2026,13 +2026,6 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckMode,
prefs::kSafeBrowsingEnterpriseRealTimeUrlCheckScope, chrome_schema));
@@ -1147,7 +1151,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
@@ -1634,8 +1634,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1697,8 +1697,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
component_updater::RegisterProfilePrefsForSwReporter(registry);
FontPrewarmerTabHelper::RegisterProfilePrefs(registry);
NetworkProfileBubble::RegisterProfilePrefs(registry);
@@ -1218,7 +1222,7 @@ diff --git a/chrome/browser/safe_browsing/BUILD.gn b/chrome/browser/safe_browsin
if (false) {
sources = [
"chrome_controller_client.cc",
@@ -443,7 +443,7 @@ static_library("safe_browsing") {
@@ -445,7 +445,7 @@ static_library("safe_browsing") {
}
}
@@ -1227,7 +1231,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",
@@ -466,7 +466,7 @@ source_set("verdict_cache_manager_factory") {
@@ -468,7 +468,7 @@ source_set("verdict_cache_manager_factory") {
]
}
@@ -1236,7 +1240,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",
@@ -488,7 +488,7 @@ static_library("advanced_protection") {
@@ -490,7 +490,7 @@ static_library("advanced_protection") {
]
}
@@ -1318,7 +1322,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.h b/
diff --git a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
--- a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
+++ b/chrome/browser/ssl/chrome_security_blocking_page_factory.cc
@@ -143,15 +143,6 @@ CreateSettingsPageHelper() {
@@ -145,15 +145,6 @@ CreateSettingsPageHelper() {
CreateChromeSettingsPageHelper();
}
@@ -1334,7 +1338,7 @@ diff --git a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc b/chrom
} // namespace
std::unique_ptr<SSLBlockingPage>
@@ -175,10 +166,6 @@ ChromeSecurityBlockingPageFactory::CreateSSLPage(
@@ -177,10 +168,6 @@ ChromeSecurityBlockingPageFactory::CreateSSLPage(
Profile::FromBrowserContext(web_contents->GetBrowserContext()));
state->DidDisplayErrorPage(cert_error);
@@ -1345,7 +1349,7 @@ diff --git a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc b/chrom
auto controller_client = std::make_unique<SSLErrorControllerClient>(
web_contents, ssl_info, cert_error, request_url,
std::move(metrics_helper), CreateSettingsPageHelper());
@@ -248,10 +235,6 @@ ChromeSecurityBlockingPageFactory::CreateMITMSoftwareBlockingPage(
@@ -250,10 +237,6 @@ ChromeSecurityBlockingPageFactory::CreateMITMSoftwareBlockingPage(
std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
const net::SSLInfo& ssl_info,
const std::string& mitm_software_name) {
@@ -1356,7 +1360,7 @@ diff --git a/chrome/browser/ssl/chrome_security_blocking_page_factory.cc b/chrom
auto page = std::make_unique<MITMSoftwareBlockingPage>(
web_contents, cert_error, request_url, std::move(ssl_cert_reporter),
/*can_show_enhanced_protection_message=*/true, ssl_info,
@@ -273,10 +256,6 @@ ChromeSecurityBlockingPageFactory::CreateBlockedInterceptionBlockingPage(
@@ -275,10 +258,6 @@ ChromeSecurityBlockingPageFactory::CreateBlockedInterceptionBlockingPage(
const GURL& request_url,
std::unique_ptr<SSLCertReporter> ssl_cert_reporter,
const net::SSLInfo& ssl_info) {
@@ -1370,7 +1374,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
@@ -424,7 +424,6 @@ static_library("ui") {
@@ -426,7 +426,6 @@ static_library("ui") {
"//chrome/browser/resources/net_internals:resources",
"//chrome/browser/resources/omnibox:resources",
"//chrome/browser/resources/usb_internals:resources",
@@ -1378,7 +1382,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",
@@ -680,7 +679,6 @@ static_library("ui") {
@@ -682,7 +681,6 @@ static_library("ui") {
# TODO(crbug.com/1158905): Remove this circular dependency.
"//chrome/browser/devtools",
"//chrome/browser/favicon",
@@ -1386,7 +1390,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"//chrome/browser/profiling_host",
"//chrome/browser/ui/webui:configs",
]
@@ -1793,8 +1791,6 @@ static_library("ui") {
@@ -1808,8 +1806,6 @@ static_library("ui") {
"//chrome/browser/resources/identity_internals:resources",
"//chrome/browser/resources/support_tool:resources",
"//chrome/browser/resources/web_app_internals:resources",
@@ -1395,7 +1399,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",
@@ -3654,8 +3650,6 @@ static_library("ui") {
@@ -3698,8 +3694,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",
@@ -1602,7 +1606,7 @@ diff --git a/chrome/browser/ui/tab_contents/chrome_web_contents_view_handle_drop
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -812,21 +812,7 @@ void DownloadItemView::UpdateLabels() {
@@ -815,21 +815,7 @@ void DownloadItemView::UpdateLabels() {
warning_label_->SizeToFit(GetLabelWidth(*warning_label_));
}
@@ -1625,7 +1629,7 @@ diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/bro
}
void DownloadItemView::UpdateButtons() {
@@ -1015,11 +1001,7 @@ ui::ImageModel DownloadItemView::GetIcon() const {
@@ -1018,11 +1004,7 @@ ui::ImageModel DownloadItemView::GetIcon() const {
switch (danger_type) {
case download::DOWNLOAD_DANGER_TYPE_UNCOMMON_CONTENT:
@@ -1638,7 +1642,7 @@ diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/bro
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_CONTENT:
case download::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST:
@@ -1270,7 +1252,6 @@ void DownloadItemView::ShowContextMenuImpl(const gfx::Rect& rect,
@@ -1273,7 +1255,6 @@ void DownloadItemView::ShowContextMenuImpl(const gfx::Rect& rect,
}
void DownloadItemView::OpenDownloadDuringAsyncScanning() {
@@ -1709,17 +1713,17 @@ 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
@@ -24,8 +24,6 @@
@@ -18,8 +18,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"
@@ -37,6 +35,13 @@
#include "third_party/skia/include/core/SkBitmap.h"
#include "components/strings/grit/components_chromium_strings.h"
@@ -27,6 +25,13 @@
#include "content/public/browser/web_ui_data_source.h"
#include "ui/base/l10n/l10n_util.h"
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
@@ -1729,27 +1733,12 @@ diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui
+#include "chrome/grit/generated_resources.h"
+#endif
+
namespace {
#if BUILDFLAG(IS_CHROMEOS_LACROS)
std::string GetPictureUrl(content::WebUI& web_ui,
@@ -95,12 +100,11 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
DCHECK(base::FeatureList::IsEnabled(kForYouFre));
auto* profile = Profile::FromWebUI(web_ui);
- content::WebUIDataSource* source = content::WebUIDataSource::CreateAndAdd(
- profile, chrome::kChromeUIIntroHost);
-
+#if BUILDFLAG(ENABLE_DICE_SUPPORT)
webui::SetupWebUIDataSource(
source, base::make_span(kIntroResources, kIntroResourcesSize),
IDR_INTRO_INTRO_HTML);
+#endif
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
int title_id = 0;
@@ -126,25 +130,6 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
}
#endif
@@ -70,26 +75,6 @@ IntroUI::IntroUI(content::WebUI* web_ui) : content::WebUIController(web_ui) {
// ends up being the URL) when we try to get it on startup for a11y purposes.
web_ui->OverrideTitle(l10n_util::GetStringUTF16(title_id));
- webui::LocalizedString localized_strings[] = {
-#if BUILDFLAG(ENABLE_DICE_SUPPORT)
@@ -1763,6 +1752,7 @@ diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui
- {"backupCardDescription", IDS_FRE_BACKUP_CARD_DESCRIPTION},
- {"declineSignInButtonTitle", IDS_FRE_DECLINE_SIGN_IN_BUTTON_TITLE},
- {"acceptSignInButtonTitle", IDS_FRE_ACCEPT_SIGN_IN_BUTTON_TITLE},
- {"productLogoAltText", IDS_SHORT_PRODUCT_LOGO_ALT_TEXT},
-#endif
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
- {"proceedLabel", IDS_PRIMARY_PROFILE_FIRST_RUN_NEXT_BUTTON_LABEL},
@@ -1770,9 +1760,9 @@ diff --git a/chrome/browser/ui/webui/intro/intro_ui.cc b/chrome/browser/ui/webui
- };
- source->AddLocalizedStrings(localized_strings);
-
// TODO(crbug.com/1409028): Replace this function by a call to
// chrome::GetDeviceManagerIdentity()
const bool is_device_managed = chrome::ShouldDisplayManagedUi(profile);
const bool is_device_managed =
policy::ManagementServiceFactory::GetForPlatform()->IsManaged();
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
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
@@ -1806,7 +1796,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
@@ -420,12 +420,10 @@ template("chrome_extra_paks") {
@@ -430,12 +430,10 @@ template("chrome_extra_paks") {
}
if (!is_android && !is_chromeos_ash) {
sources += [
@@ -1822,7 +1812,7 @@ 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
@@ -95,11 +95,6 @@ SandboxedRarAnalyzer::SandboxedRarAnalyzer(
@@ -76,11 +76,6 @@ SandboxedRarAnalyzer::SandboxedRarAnalyzer(
service_(std::move(service)) {
DCHECK(callback_);
DCHECK(!file_path_.value().empty());
@@ -1834,13 +1824,16 @@ diff --git a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc b/ch
}
void SandboxedRarAnalyzer::Start() {
@@ -121,19 +116,12 @@ SandboxedRarAnalyzer::~SandboxedRarAnalyzer() = default;
void SandboxedRarAnalyzer::AnalyzeFile(base::File file, base::File temp_file) {
@@ -102,22 +97,12 @@ SandboxedRarAnalyzer::~SandboxedRarAnalyzer() = default;
void SandboxedRarAnalyzer::AnalyzeFile(base::File file) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
DCHECK(!file_path_.value().empty());
- if (remote_analyzer_) {
- mojo::PendingRemote<chrome::mojom::TemporaryFileGetter>
- temp_file_getter_remote =
- temp_file_getter_.GetRemoteTemporaryFileGetter();
- remote_analyzer_->AnalyzeRarFile(
- std::move(file), std::move(temp_file),
- std::move(file), std::move(temp_file_getter_remote),
- base::BindOnce(&SandboxedRarAnalyzer::AnalyzeFileDone, GetWeakPtr()));
- } else {
AnalyzeFileDone(safe_browsing::ArchiveAnalyzerResults());
@@ -1854,7 +1847,7 @@ diff --git a/chrome/services/file_util/public/cpp/sandboxed_rar_analyzer.cc b/ch
if (callback_) {
std::move(callback_).Run(results);
}
@@ -150,9 +138,7 @@ void SandboxedRarAnalyzer::ReportFileFailure(
@@ -134,9 +119,7 @@ void SandboxedRarAnalyzer::ReportFileFailure(
}
std::string SandboxedRarAnalyzer::DebugString() const {
@@ -1868,45 +1861,45 @@ 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
@@ -11,7 +11,6 @@
#include "base/memory/weak_ptr.h"
@@ -12,7 +12,6 @@
#include "base/task/sequenced_task_runner.h"
#include "chrome/services/file_util/public/cpp/temporary_file_getter.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"
@@ -73,7 +72,6 @@ class SandboxedRarAnalyzer {
@@ -74,7 +73,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_;
TemporaryFileGetter temp_file_getter_;
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
@@ -10,7 +10,6 @@
#include "base/functional/callback.h"
@@ -11,7 +11,6 @@
#include "base/memory/ref_counted_delete_on_sequence.h"
#include "chrome/services/file_util/public/cpp/temporary_file_getter.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 SandboxedZipAnalyzer {
@@ -69,7 +68,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_;
TemporaryFileGetter temp_file_getter_;
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
@@ -297,7 +297,6 @@ static_library("test_support") {
@@ -298,7 +298,6 @@ static_library("test_support") {
"//chrome:strings",
"//chrome/browser:browser_process",
"//chrome/browser:test_support",
@@ -1914,7 +1907,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//chrome/browser/sharing/proto",
"//chrome/child",
"//chrome/common:non_code_constants",
@@ -5933,9 +5932,6 @@ test("unit_tests") {
@@ -6021,9 +6020,6 @@ test("unit_tests") {
"//chrome/browser/profile_resetter:profile_reset_report_proto",
"//chrome/browser/profiling_host",
"//chrome/browser/push_messaging:budget_proto",
@@ -1927,18 +1920,18 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
diff --git a/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc b/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
--- a/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
+++ b/components/safe_browsing/content/browser/mojo_safe_browsing_impl.cc
@@ -121,6 +121,7 @@ void MojoSafeBrowsingImpl::MaybeCreate(
return;
@@ -127,6 +127,7 @@ void MojoSafeBrowsingImpl::MaybeCreate(
user_data = resource_context.get();
}
+ NOTREACHED();
std::unique_ptr<MojoSafeBrowsingImpl> impl(new MojoSafeBrowsingImpl(
std::move(delegate), render_process_id, resource_context));
std::move(delegate), render_process_id, user_data));
impl->Clone(std::move(receiver));
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
@@ -221,7 +221,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
@@ -237,7 +237,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry) {
registry->RegisterIntegerPref(prefs::kPasswordProtectionWarningTrigger,
PASSWORD_PROTECTION_OFF);
registry->RegisterInt64Pref(prefs::kAdvancedProtectionLastRefreshInUs, 0);
build/patches/00WIN-ADDTO-Eyeo-Adblock.patch
+2 -2
View File
@@ -9,12 +9,12 @@ Subject: WIN ADDTO Eyeo Adblock
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -2428,10 +2428,6 @@ if (!is_android) {
@@ -2465,10 +2465,6 @@ if (!is_android) {
sources += [ "../browser/chrome_for_testing/chrome_for_testing_info_bar_browsertest.cc" ]
}
- if (eyeo_intercept_debug_url) {
- sources += [ "../browser/adblock/adblock_debug_url_browsertest.cc" ]
- sources += [ "../browser/adblock/test/adblock_debug_url_browsertest.cc" ]
- }
-
if (enable_reporting) {
build/patches/00WIN-ADDTO-Remove-signin-and-sync-integrations.patch
+25 -25
View File
@@ -14,19 +14,19 @@ Subject: WIN ADDTO Remove signin and sync integrations
...rofile_picker_signed_in_flow_controller.cc | 37 --
...profile_picker_signed_in_flow_controller.h | 2 -
.../signin/profile_customization_handler.cc | 2 +
.../webui/signin/profile_customization_ui.cc | 3 +-
.../webui/signin/profile_customization_ui.cc | 2 +
.../ui/webui/signin/profile_picker_handler.cc | 5 +-
components/signin/public/android/BUILD.gn | 1 -
.../identitymanager/IdentityManager.java | 21 +-
.../identity_manager/identity_manager.cc | 463 ++----------------
.../identity_manager/identity_manager.h | 47 +-
.../identity_manager_builder.cc | 3 +
18 files changed, 45 insertions(+), 604 deletions(-)
18 files changed, 45 insertions(+), 603 deletions(-)
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4165,8 +4165,6 @@ static_library("browser") {
@@ -4134,8 +4134,6 @@ static_library("browser") {
"sharing_hub/sharing_hub_service_factory.h",
"signin/signin_promo.cc",
"signin/signin_promo.h",
@@ -35,7 +35,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"signin/signin_ui_util.cc",
"signin/signin_ui_util.h",
"speech/chrome_speech_recognition_service.cc",
@@ -6712,12 +6710,6 @@ static_library("browser") {
@@ -6695,12 +6693,6 @@ static_library("browser") {
"signin/signin_ui_delegate_impl_dice.cc",
"signin/signin_ui_delegate_impl_dice.h",
]
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/signin/identity_manager_factory.cc b/chrome/browser/
#endif
void IdentityManagerFactory::RegisterProfilePrefs(
@@ -155,12 +154,6 @@ KeyedService* IdentityManagerFactory::BuildServiceInstanceFor(
@@ -162,12 +161,6 @@ KeyedService* IdentityManagerFactory::BuildServiceInstanceFor(
params.is_regular_profile = is_regular_profile;
#endif
@@ -181,7 +181,7 @@ diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/sig
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
@@ -3691,12 +3691,6 @@ static_library("ui") {
@@ -3735,12 +3735,6 @@ static_library("ui") {
"webui/signin/signin_ui_error.h",
"webui/signin/signin_utils_desktop.cc",
"webui/signin/signin_utils_desktop.h",
@@ -197,20 +197,20 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -413,8 +413,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
if (AccountConsistencyModeManager::IsMirrorEnabledForProfile(profile_))
welcome_enabled = false;
#elif !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -411,8 +411,7 @@ StartupBrowserCreatorImpl::DetermineURLsAndLaunch(
bool welcome_enabled = false;
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
- welcome_enabled =
- welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_);
+ welcome_enabled = false;
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
const bool whats_new_enabled =
diff --git a/chrome/browser/ui/startup/startup_tab_provider.cc b/chrome/browser/ui/startup/startup_tab_provider.cc
--- a/chrome/browser/ui/startup/startup_tab_provider.cc
+++ b/chrome/browser/ui/startup/startup_tab_provider.cc
@@ -185,11 +185,6 @@ StartupTabs StartupTabProviderImpl::GetWelcomeBackTabs(
@@ -186,11 +186,6 @@ StartupTabs StartupTabProviderImpl::GetWelcomeBackTabs(
!browser_creator) {
return tabs;
}
@@ -236,18 +236,19 @@ diff --git a/chrome/browser/ui/views/profiles/profile_customization_bubble_view.
diff --git a/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_controller.cc b/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_controller.cc
--- a/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_controller.cc
+++ b/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_controller.cc
@@ -10,10 +10,8 @@
@@ -10,11 +10,9 @@
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "chrome/browser/ui/views/profiles/profile_management_utils.h"
-#include "chrome/browser/ui/views/profiles/profile_picker_turn_sync_on_delegate.h"
#include "chrome/browser/ui/webui/signin/signin_url_utils.h"
#include "chrome/browser/ui/webui/signin/signin_utils.h"
#include "chrome/browser/ui/webui/signin/sync_confirmation_ui.h"
-#include "chrome/browser/ui/webui/signin/turn_sync_on_helper.h"
#include "chrome/common/webui_url_constants.h"
#include "components/signin/public/base/signin_metrics.h"
#include "components/signin/public/identity_manager/account_info.h"
@@ -30,7 +28,6 @@ ProfilePickerSignedInFlowController::ProfilePickerSignedInFlowController(
@@ -31,7 +29,6 @@ ProfilePickerSignedInFlowController::ProfilePickerSignedInFlowController(
: host_(host),
profile_(profile),
contents_(std::move(contents)),
@@ -255,7 +256,7 @@ diff --git a/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_cont
profile_color_(profile_color) {
DCHECK(profile_);
DCHECK(contents_);
@@ -49,27 +46,6 @@ void ProfilePickerSignedInFlowController::Init() {
@@ -50,27 +47,6 @@ void ProfilePickerSignedInFlowController::Init() {
DCHECK(!IsInitialized());
contents()->SetDelegate(this);
@@ -283,7 +284,7 @@ diff --git a/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_cont
}
void ProfilePickerSignedInFlowController::Cancel() {}
@@ -161,19 +137,6 @@ void ProfilePickerSignedInFlowController::
@@ -169,19 +145,6 @@ void ProfilePickerSignedInFlowController::
signin::SigninChoiceCallback proceed_callback) {
DCHECK(IsInitialized());
// Initialize the WebUI page once we know it's committed.
@@ -306,7 +307,7 @@ diff --git a/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_cont
diff --git a/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_controller.h b/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_controller.h
--- a/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_controller.h
+++ b/chrome/browser/ui/views/profiles/profile_picker_signed_in_flow_controller.h
@@ -129,8 +129,6 @@ class ProfilePickerSignedInFlowController
@@ -136,8 +136,6 @@ class ProfilePickerSignedInFlowController
// sign-in flow.
std::unique_ptr<content::WebContents> contents_;
@@ -337,7 +338,7 @@ diff --git a/chrome/browser/ui/webui/signin/profile_customization_handler.cc b/c
diff --git a/chrome/browser/ui/webui/signin/profile_customization_ui.cc b/chrome/browser/ui/webui/signin/profile_customization_ui.cc
--- a/chrome/browser/ui/webui/signin/profile_customization_ui.cc
+++ b/chrome/browser/ui/webui/signin/profile_customization_ui.cc
@@ -102,10 +102,11 @@ ProfileCustomizationUI::ProfileCustomizationUI(content::WebUI* web_ui)
@@ -103,9 +103,11 @@ ProfileCustomizationUI::ProfileCustomizationUI(content::WebUI* web_ui)
"profileCustomizationInDialogDesign",
base::FeatureList::IsEnabled(kSyncPromoAfterSigninIntercept));
const GURL& url = web_ui->GetWebContents()->GetVisibleURL();
@@ -345,15 +346,14 @@ diff --git a/chrome/browser/ui/webui/signin/profile_customization_ui.cc b/chrome
source->AddBoolean("isLocalProfileCreation",
GetProfileCustomizationStyle(url) ==
ProfileCustomizationStyle::kLocalProfileCreation);
-
+#endif
if (url.query() == "debug") {
// Not intended to be hooked to anything. The bubble will not initialize it
// so we force it here.
source->AddString(
"chromeRefresh2023Attribute",
features::IsChromeRefresh2023() ? "chrome-refresh-2023" : "");
diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler.cc b/chrome/browser/ui/webui/signin/profile_picker_handler.cc
--- a/chrome/browser/ui/webui/signin/profile_picker_handler.cc
+++ b/chrome/browser/ui/webui/signin/profile_picker_handler.cc
@@ -962,6 +962,7 @@ void ProfilePickerHandler::HandleSelectNewAccount(
@@ -953,6 +953,7 @@ void ProfilePickerHandler::HandleSelectNewAccount(
const base::Value::List& args) {
AllowJavascript();
CHECK_EQ(1U, args.size());
@@ -361,7 +361,7 @@ diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler.cc b/chrome/b
absl::optional<SkColor> profile_color = args[0].GetIfInt();
#if BUILDFLAG(IS_CHROMEOS_LACROS)
SelectAccountLacrosInternal("", profile_color);
@@ -977,6 +978,7 @@ void ProfilePickerHandler::HandleSelectNewAccount(
@@ -968,6 +969,7 @@ void ProfilePickerHandler::HandleSelectNewAccount(
#else
NOTERACHED();
#endif
@@ -369,7 +369,7 @@ diff --git a/chrome/browser/ui/webui/signin/profile_picker_handler.cc b/chrome/b
}
#if BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -1068,9 +1070,6 @@ void ProfilePickerHandler::OnSwitchToProfileCompleteOpenCustomization(
@@ -1059,9 +1061,6 @@ void ProfilePickerHandler::OnSwitchToProfileCompleteOpenCustomization(
BeginFirstWebContentsProfiling(browser, profile_picked_time_on_startup_);
}
build/patches/00WIN-Add-adblock-plus-setting-page.patch
+3 -3
View File
@@ -22,7 +22,7 @@ Subject: WIN Add adblock plus setting page
diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn
--- a/chrome/browser/resources/settings/BUILD.gn
+++ b/chrome/browser/resources/settings/BUILD.gn
@@ -71,6 +71,7 @@ build_webui("build") {
@@ -72,6 +72,7 @@ build_webui("build") {
"a11y_page/a11y_page.ts",
"a11y_page/live_caption_section.ts",
"about_page/about_page.ts",
@@ -30,7 +30,7 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resourc
"appearance_page/appearance_fonts_page.ts",
"appearance_page/appearance_page.ts",
"appearance_page/home_url_input.ts",
@@ -392,6 +393,7 @@ build_webui("build") {
@@ -390,6 +391,7 @@ build_webui("build") {
ts_composite = true
ts_definitions = [
"//tools/typescript/definitions/autofill_private.d.ts",
@@ -463,7 +463,7 @@ diff --git a/chrome/browser/resources/settings/basic_page/basic_page.ts b/chrome
import 'chrome://resources/polymer/v3_0/iron-flex-layout/iron-flex-layout-classes.js';
+import '../adblock_page/adblock_page.js';
import '../appearance_page/appearance_page.js';
import '../privacy_page/privacy_guide_promo.js';
import '../privacy_page/privacy_guide/privacy_guide_promo.js';
import '../privacy_page/privacy_page.js';
diff --git a/chrome/browser/resources/settings/page_visibility.ts b/chrome/browser/resources/settings/page_visibility.ts
--- a/chrome/browser/resources/settings/page_visibility.ts
build/patches/00add-browser-policy.patch
+27 -42
View File
@@ -13,7 +13,6 @@ Subject: Add browser policy
.../ui/webui/policy/policy_ui_handler.h | 2 +
.../core/browser/browser_policy_connector.cc | 3 +
.../common/command_line_policy_provider.cc | 3 +
components/policy/core/common/features.cc | 4 +-
.../core/common/policy_loader_command_line.cc | 120 +++++++++++++++---
.../policy/core/common/policy_pref_names.cc | 3 +
.../policy/core/common/policy_pref_names.h | 1 +
@@ -27,14 +26,14 @@ Subject: Add browser policy
components/signin/features.gni | 6 +-
.../gaia_cookie_manager_service.cc | 4 +
google_apis/gaia/gaia_auth_fetcher.cc | 1 +
24 files changed, 295 insertions(+), 35 deletions(-)
23 files changed, 293 insertions(+), 33 deletions(-)
diff --git a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
--- a/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
+++ b/chrome/browser/android/preferences/privacy_preferences_manager_impl.cc
@@ -61,6 +61,11 @@ JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy(
}
@@ -55,6 +55,11 @@ static jboolean
JNI_PrivacyPreferencesManagerImpl_IsMetricsReportingDisabledByPolicy(
JNIEnv* env) {
const PrefService* local_state = g_browser_process->local_state();
+ // this point (policy with 'future') gave me false, false
+ // LOG(INFO) << "---IsMetricsReportingDisabledByPolicy "
@@ -88,7 +87,7 @@ diff --git a/chrome/browser/policy/chrome_browser_policy_connector.cc b/chrome/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
@@ -1883,9 +1883,9 @@ bool AreFuturePoliciesEnabledByDefault() {
@@ -1923,9 +1923,9 @@ bool AreFuturePoliciesEnabledByDefault() {
// Enable future policies for branded browser tests.
if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kTestType))
return true;
@@ -104,7 +103,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc
--- a/chrome/browser/signin/account_consistency_mode_manager.cc
+++ b/chrome/browser/signin/account_consistency_mode_manager.cc
@@ -31,7 +31,14 @@
@@ -34,7 +34,14 @@
#error "Dice and Mirror cannot be both enabled."
#endif
@@ -120,7 +119,7 @@ diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/
// #error "Either Dice or Mirror should be enabled."
// #endif
@@ -189,7 +196,8 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
@@ -198,7 +205,8 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
#endif
#if BUILDFLAG(ENABLE_MIRROR)
@@ -130,7 +129,7 @@ diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/
#endif
#if BUILDFLAG(ENABLE_DICE_SUPPORT)
@@ -199,8 +207,12 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
@@ -208,8 +216,12 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod(
return AccountConsistencyMethod::kDisabled;
}
@@ -163,7 +162,7 @@ diff --git a/chrome/browser/signin/chrome_signin_client.cc b/chrome/browser/sign
@@ -239,6 +241,8 @@ void ChromeSigninClient::OnConnectionChanged(
#endif
void ChromeSigninClient::DelayNetworkCall(base::OnceClosure callback) {
bool ChromeSigninClient::AreNetworkCallsDelayed() {
+ // Make ChromeSigninClient compliant to SigninAllowed policy
+ if (!AreSigninCookiesAllowed()) return;
#if BUILDFLAG(IS_CHROMEOS_ASH)
@@ -194,7 +193,7 @@ diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browse
#include "components/policy/core/common/policy_scheduler.h"
#include "components/policy/core/common/policy_types.h"
#include "components/policy/core/common/remote_commands/remote_commands_service.h"
@@ -168,6 +171,10 @@ void PolicyUIHandler::RegisterMessages() {
@@ -160,6 +163,10 @@ void PolicyUIHandler::RegisterMessages() {
"exportPoliciesJSON",
base::BindRepeating(&PolicyUIHandler::HandleExportPoliciesJson,
base::Unretained(this)));
@@ -205,7 +204,7 @@ diff --git a/chrome/browser/ui/webui/policy/policy_ui_handler.cc b/chrome/browse
web_ui()->RegisterMessageCallback(
"listenPoliciesUpdates",
base::BindRepeating(&PolicyUIHandler::HandleListenPoliciesUpdates,
@@ -331,8 +338,102 @@ void PolicyUIHandler::SendPolicies() {
@@ -323,8 +330,102 @@ void PolicyUIHandler::SendPolicies() {
"policies-updated",
base::Value(
policy_value_and_status_aggregator_->GetAggregatedPolicyNames()),
@@ -348,20 +347,6 @@ diff --git a/components/policy/core/common/command_line_policy_provider.cc b/com
#if BUILDFLAG(IS_ANDROID)
if (channel == version_info::Channel::STABLE ||
channel == version_info::Channel::BETA) {
diff --git a/components/policy/core/common/features.cc b/components/policy/core/common/features.cc
--- a/components/policy/core/common/features.cc
+++ b/components/policy/core/common/features.cc
@@ -27,8 +27,8 @@ BASE_FEATURE(kEnableUserCloudSigninRestrictionPolicyFetcher,
base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kActivateMetricsReportingEnabledPolicyAndroid,
- "ActivateMetricsReportingEnabledPolicyAndroid",
- base::FEATURE_ENABLED_BY_DEFAULT);
+ "ActivateMetricsReportingEnabledPolicyAndroid", // guard this
+ base::FEATURE_ENABLED_BY_DEFAULT); // guard this
BASE_FEATURE(kDmTokenDeletion,
"DmTokenDeletion",
diff --git a/components/policy/core/common/policy_loader_command_line.cc b/components/policy/core/common/policy_loader_command_line.cc
--- a/components/policy/core/common/policy_loader_command_line.cc
+++ b/components/policy/core/common/policy_loader_command_line.cc
@@ -505,7 +490,7 @@ diff --git a/components/policy/core/common/policy_loader_command_line.cc b/compo
diff --git a/components/policy/core/common/policy_pref_names.cc b/components/policy/core/common/policy_pref_names.cc
--- a/components/policy/core/common/policy_pref_names.cc
+++ b/components/policy/core/common/policy_pref_names.cc
@@ -95,6 +95,9 @@ const char kBackForwardCacheEnabled[] = "policy.back_forward_cache_enabled";
@@ -90,6 +90,9 @@ const char kBackForwardCacheEnabled[] = "policy.back_forward_cache_enabled";
const char kUserAgentClientHintsGREASEUpdateEnabled[] =
"policy.user_agent_client_hints_grease_update_enabled";
@@ -518,18 +503,18 @@ diff --git a/components/policy/core/common/policy_pref_names.cc b/components/pol
diff --git a/components/policy/core/common/policy_pref_names.h b/components/policy/core/common/policy_pref_names.h
--- a/components/policy/core/common/policy_pref_names.h
+++ b/components/policy/core/common/policy_pref_names.h
@@ -33,6 +33,7 @@ POLICY_EXPORT extern const char kUrlAllowlist[];
POLICY_EXPORT extern const char kUserPolicyRefreshRate[];
POLICY_EXPORT extern const char kIntensiveWakeUpThrottlingEnabled[];
POLICY_EXPORT extern const char kUserAgentClientHintsGREASEUpdateEnabled[];
+POLICY_EXPORT extern const char kDisabledDefaultPoliciesList[];
POLICY_EXPORT extern const char kUnthrottledNestedTimeoutEnabled[];
@@ -33,6 +33,7 @@ extern const char kUrlAllowlist[];
extern const char kUserPolicyRefreshRate[];
extern const char kIntensiveWakeUpThrottlingEnabled[];
extern const char kUserAgentClientHintsGREASEUpdateEnabled[];
+extern const char kDisabledDefaultPoliciesList[];
#if BUILDFLAG(IS_ANDROID)
POLICY_EXPORT extern const char kBackForwardCacheEnabled[];
extern const char kBackForwardCacheEnabled[];
#endif // BUILDFLAG(IS_ANDROID)
diff --git a/components/policy/core/common/policy_service_impl.cc b/components/policy/core/common/policy_service_impl.cc
--- a/components/policy/core/common/policy_service_impl.cc
+++ b/components/policy/core/common/policy_service_impl.cc
@@ -66,6 +66,9 @@ void IgnoreUserCloudPrecedencePolicies(PolicyMap* policies) {
@@ -64,6 +64,9 @@ void IgnoreUserCloudPrecedencePolicies(PolicyMap* policies) {
// Metrics should not be enforced so if this policy is set as mandatory
// downgrade it to a recommended level policy.
void DowngradeMetricsReportingToRecommendedPolicy(PolicyMap* policies) {
@@ -554,13 +539,13 @@ diff --git a/components/policy/core/common/policy_switches.cc b/components/polic
diff --git a/components/policy/core/common/policy_switches.h b/components/policy/core/common/policy_switches.h
--- a/components/policy/core/common/policy_switches.h
+++ b/components/policy/core/common/policy_switches.h
@@ -18,6 +18,7 @@ POLICY_EXPORT extern const char kRealtimeReportingUrl[];
POLICY_EXPORT extern const char kEncryptedReportingUrl[];
POLICY_EXPORT extern const char kChromePolicy[];
POLICY_EXPORT extern const char kSecureConnectApiUrl[];
+POLICY_EXPORT extern const char kForceDisabledPolicies[];
@@ -18,6 +18,7 @@ extern const char kRealtimeReportingUrl[];
extern const char kEncryptedReportingUrl[];
extern const char kChromePolicy[];
extern const char kSecureConnectApiUrl[];
+extern const char kForceDisabledPolicies[];
#if BUILDFLAG(IS_CHROMEOS_ASH)
POLICY_EXPORT extern const char kDisablePolicyKeyVerification[];
extern const char kDisablePolicyKeyVerification[];
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git a/components/policy/resources/templates/policy_definitions/Miscellaneous/SyncDisabled.yaml b/components/policy/resources/templates/policy_definitions/Miscellaneous/SyncDisabled.yaml
--- a/components/policy/resources/templates/policy_definitions/Miscellaneous/SyncDisabled.yaml
@@ -638,7 +623,7 @@ diff --git a/components/policy/resources/webui/policy_row.js b/components/policy
diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp
--- a/components/policy_strings.grdp
+++ b/components/policy_strings.grdp
@@ -588,8 +588,8 @@ Additional details:
@@ -591,8 +591,8 @@ Additional details:
<message name="IDS_POLICY_SOURCE_DEFAULT" desc="Indicates that a policy is set by default and can be overridden.">
Default
</message>
build/patches/Add-an-always-incognito-mode.patch
+69 -62
View File
@@ -59,7 +59,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
chrome/browser/history/history_tab_helper.h | 10 +-
.../android/offline_page_bridge.cc | 11 +-
.../android/offline_page_model_factory.cc | 20 ++-
.../android/request_coordinator_factory.cc | 27 ++-
.../android/request_coordinator_factory.cc | 34 +++-
.../offline_page_model_factory.h | 1 +
.../offline_pages/recent_tab_helper.cc | 19 ++-
.../browser/offline_pages/recent_tab_helper.h | 3 +
@@ -84,7 +84,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../omnibox/browser/base_search_provider.cc | 2 +-
components/omnibox/browser/search_provider.cc | 4 +-
.../host_content_settings_map_factory.cc | 1 +
65 files changed, 737 insertions(+), 82 deletions(-)
65 files changed, 737 insertions(+), 89 deletions(-)
create mode 100644 chrome/android/java/res/xml/incognito_preferences.xml
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/AlwaysIncognitoLinkInterceptor.java
create mode 100644 chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/IncognitoSettings.java
@@ -93,7 +93,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
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
@@ -640,6 +640,7 @@ chrome_java_resources = [
@@ -638,6 +638,7 @@ chrome_java_resources = [
"java/res/xml/main_preferences.xml",
"java/res/xml/manage_sync_preferences.xml",
"java/res/xml/phone_as_a_security_key_accessory_filter.xml",
@@ -112,7 +112,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/com/google/android/apps/chrome/appwidget/bookmarks/BookmarkThumbnailWidgetProvider.java",
"java/src/org/chromium/chrome/browser/ActivityTabProvider.java",
"java/src/org/chromium/chrome/browser/ActivityUtils.java",
@@ -894,6 +895,7 @@ chrome_java_sources = [
@@ -895,6 +896,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/privacy/settings/IncognitoLockSettings.java",
"java/src/org/chromium/chrome/browser/privacy/settings/PrivacyPreferencesManagerImpl.java",
"java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java",
@@ -238,7 +238,7 @@ new file mode 100644
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
@@ -58,6 +58,10 @@ import org.chromium.base.task.PostTask;
@@ -56,6 +56,10 @@ import org.chromium.base.task.TaskTraits;
import org.chromium.build.annotations.UsedByReflection;
import org.chromium.cc.input.BrowserControlsState;
import org.chromium.chrome.R;
@@ -249,7 +249,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
import org.chromium.chrome.browser.IntentHandler.IntentHandlerDelegate;
import org.chromium.chrome.browser.IntentHandler.TabOpenType;
import org.chromium.chrome.browser.accessibility_tab_switcher.OverviewListLayout;
@@ -571,9 +575,14 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -555,9 +559,14 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
mTabModelOrchestrator.onNativeLibraryReady(getTabContentManager());
// For saving non-incognito tab closures for Recent Tabs.
@@ -264,10 +264,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
+ mHistoricalTabModelObserver =
+ new HistoricalTabModelObserver(mTabModelSelector.getModel(alwaysIncognito));
+ }
if (TabUiFeatureUtilities.isTabletGridTabSwitcherEnabled(this)) {
if (DeviceFormFactor.isNonMultiDisplayContextOnTablet(this)) {
mTabModelSelector.addObserver(new TabModelSelectorObserver() {
@Override
@@ -1901,8 +1910,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -1865,8 +1874,9 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
Bundle savedInstanceState = getSavedInstanceState();
// We determine the model as soon as possible so every systems get initialized coherently.
@@ -282,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
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
@@ -93,6 +93,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.ContentOffsetProvi
@@ -92,6 +92,7 @@ import org.chromium.chrome.browser.compositor.layouts.content.ContentOffsetProvi
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerHandler;
import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
@@ -290,7 +290,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
import org.chromium.chrome.browser.dependency_injection.ModuleFactoryOverrides;
import org.chromium.chrome.browser.device.DeviceClassManager;
@@ -1795,6 +1796,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1787,6 +1788,9 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
throw new IllegalStateException(
"Attempting to access TabCreator before initialization");
}
@@ -303,7 +303,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/AppMenuPropertiesDelegateImpl.java
@@ -36,6 +36,7 @@ import org.chromium.base.supplier.ObservableSupplier;
@@ -38,6 +38,7 @@ import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.base.supplier.OneshotSupplier;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.ActivityTabProvider;
@@ -311,7 +311,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
import org.chromium.chrome.browser.banners.AppMenuVerbiage;
import org.chromium.chrome.browser.bookmarks.BookmarkFeatures;
import org.chromium.chrome.browser.bookmarks.BookmarkModel;
@@ -96,6 +97,10 @@ import java.util.ArrayList;
@@ -102,6 +103,10 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -322,7 +322,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
/**
* Base implementation of {@link AppMenuPropertiesDelegate} that handles hiding and showing menu
* items based on activity state.
@@ -554,6 +559,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
@@ -560,6 +565,13 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
}
private void prepareCommonMenuItems(Menu menu, @MenuGroup int menuGroup, boolean isIncognito) {
@@ -336,7 +336,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
// We have to iterate all menu items since same menu item ID may be associated with more
// than one menu items.
boolean isOverviewModeMenu = menuGroup == MenuGroup.OVERVIEW_MODE_MENU;
@@ -629,7 +641,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
@@ -635,7 +647,15 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
}
if (item.getItemId() == R.id.recent_tabs_menu_id) {
@@ -353,7 +353,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
}
if (item.getItemId() == R.id.menu_group_tabs) {
item.setVisible(isMenuGroupTabsVisible);
@@ -847,7 +867,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
@@ -853,7 +873,9 @@ public class AppMenuPropertiesDelegateImpl implements AppMenuPropertiesDelegate
// is not persisted when adding to the homescreen.
// * If creating shortcuts it not supported by the current home screen.
return WebappsUtils.isAddToHomeIntentSupported() && !isChromeScheme && !isFileScheme
@@ -367,16 +367,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/appmenu/App
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
@@ -30,6 +30,7 @@ import org.chromium.base.ContextUtils;
import org.chromium.base.metrics.RecordHistogram;
@@ -29,6 +29,7 @@ import org.chromium.base.Callback;
import org.chromium.base.ContextUtils;
import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.R;
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator;
import org.chromium.chrome.browser.contextmenu.ChromeContextMenuItem.Item;
import org.chromium.chrome.browser.contextmenu.ContextMenuCoordinator.ListItemType;
@@ -355,6 +356,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
boolean hasSaveImage = false;
@@ -236,6 +237,9 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
public List<Pair<Integer, ModelList>> buildContextMenu() {
mShowEphemeralTabNewLabel = null;
+ boolean always_incognito =
@@ -385,7 +385,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
List<Pair<Integer, ModelList>> groupedItems = new ArrayList<>();
if (mParams.isAnchor()) {
@@ -373,6 +377,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -254,6 +258,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
linkGroup.add(createListItem(Item.OPEN_IN_NEW_TAB_IN_GROUP));
}
}
@@ -393,7 +393,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/Chr
if (!mItemDelegate.isIncognito() && mItemDelegate.isIncognitoSupported()) {
linkGroup.add(createListItem(Item.OPEN_IN_INCOGNITO_TAB));
}
@@ -397,7 +402,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
@@ -278,7 +283,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
}
}
if (FirstRunStatus.getFirstRunFlowComplete()) {
@@ -461,7 +461,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java
@@ -55,6 +55,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
@@ -57,6 +57,9 @@ import org.chromium.components.embedder_support.util.UrlConstants;
import org.chromium.components.version_info.VersionInfo;
import org.chromium.device.mojom.ScreenOrientationLockType;
@@ -471,7 +471,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/Cust
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
@@ -1171,7 +1174,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
@@ -1175,7 +1178,7 @@ public class CustomTabIntentDataProvider extends BrowserServicesIntentDataProvid
@Override
public boolean isIncognito() {
@@ -648,7 +648,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
import org.chromium.chrome.browser.app.ChromeActivity;
import org.chromium.chrome.browser.app.download.home.DownloadPage;
import org.chromium.chrome.browser.bookmarks.BookmarkPage;
@@ -231,7 +232,8 @@ public class NativePageFactory {
@@ -223,7 +224,8 @@ public class NativePageFactory {
String url, NativePage candidatePage, Tab tab, boolean isIncognito) {
NativePage page;
@@ -661,7 +661,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsManager.java
@@ -21,6 +21,15 @@ import org.chromium.chrome.browser.ui.favicon.FaviconHelper;
@@ -22,6 +22,15 @@ import org.chromium.chrome.browser.ui.favicon.FaviconHelper;
import org.chromium.chrome.browser.ui.favicon.FaviconHelper.FaviconImageCallback;
import org.chromium.url.GURL;
@@ -677,7 +677,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -78,7 +87,8 @@ public class RecentTabsManager {
@@ -79,7 +88,8 @@ public class RecentTabsManager {
*/
public RecentTabsManager(Tab tab, TabModelSelector tabModelSelector, Profile profile,
Context context, Runnable showHistoryManager) {
@@ -687,7 +687,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsM
mActiveTab = tab;
mTabModelSelector = tabModelSelector;
mShowHistoryManager = showHistoryManager;
@@ -210,6 +220,22 @@ public class RecentTabsManager {
@@ -211,6 +221,22 @@ public class RecentTabsManager {
*/
public void openRecentlyClosedTab(RecentlyClosedTab tab, int windowDisposition) {
if (mIsDestroyed) return;
@@ -878,7 +878,7 @@ new file mode 100644
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -61,6 +61,7 @@ import org.chromium.chrome.browser.profiles.Profile;
@@ -62,6 +62,7 @@ import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileManagerUtils;
import org.chromium.chrome.browser.search_engines.settings.SearchEngineSettings;
import org.chromium.chrome.browser.site_settings.ChromeSiteSettingsDelegate;
@@ -886,16 +886,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/Settin
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager.SnackbarManageable;
import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
@@ -316,6 +317,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -306,6 +307,9 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
((PrivacySandboxSettingsBaseFragment) fragment)
.setSnackbarManager(getSnackbarManager());
}
+ if (fragment instanceof INeedSnackbarManager) {
+ ((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager);
+ }
initBackPressHandler();
}
@Override
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore/HistoricalTabModelObserver.java
@@ -1008,7 +1008,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/tab_restore
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java
@@ -123,6 +123,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto
@@ -119,6 +119,8 @@ import org.chromium.components.webapps.bottomsheet.PwaBottomSheetControllerFacto
import org.chromium.content_public.browser.WebContents;
import org.chromium.ui.base.ActivityWindowAndroid;
import org.chromium.ui.base.DeviceFormFactor;
@@ -1017,15 +1017,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
import org.chromium.ui.base.IntentRequestTracker;
import org.chromium.ui.modaldialog.ModalDialogManager;
@@ -508,7 +510,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
mAppMenuCoordinator == null ? null : mAppMenuCoordinator.getAppMenuHandler();
mEmptyBackgroundViewWrapper =
new EmptyBackgroundViewWrapper(mTabModelSelectorSupplier.get(),
- mTabCreatorManagerSupplier.get().getTabCreator(false), mActivity,
+ mTabCreatorManagerSupplier.get().getTabCreator(AlwaysIncognitoLinkInterceptor.isAlwaysIncognito()), mActivity,
appMenuHandler, mSnackbarManagerSupplier.get(), mLayoutManagerSupplier);
mEmptyBackgroundViewWrapper.initialize();
}
@@ -767,7 +769,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
mAppMenuCoordinator.getAppMenuHandler(), mActivityTabProvider,
mToolbarManager.getMenuButtonView(), () -> {
mTabCreatorManagerSupplier.get()
- .getTabCreator(/*incognito=*/false)
+ .getTabCreator(AlwaysIncognitoLinkInterceptor.isAlwaysIncognito())
.launchUrl(NewTabPageUtils.encodeNtpUrl(
NewTabPageLaunchOrigin.WEB_FEED),
TabLaunchType.FROM_CHROME_UI);
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/ChromeTabCreator.java
@@ -1071,8 +1071,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabMod
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPersistentStore.java
@@ -56,6 +56,8 @@ import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.content_public.browser.UiThreadTaskTraits;
@@ -55,6 +55,8 @@ import org.chromium.components.embedder_support.util.UrlUtilities;
import org.chromium.content_public.browser.LoadUrlParams;
import org.chromium.url.GURL;
+import org.chromium.chrome.browser.AlwaysIncognitoLinkInterceptor;
@@ -1080,7 +1080,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabmodel/TabPer
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -740,6 +742,13 @@ public class TabPersistentStore {
@@ -738,6 +740,13 @@ public class TabPersistentStore {
}
}
}
@@ -1105,7 +1105,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
import org.chromium.chrome.browser.IntentHandler;
import org.chromium.chrome.browser.app.tab_activity_glue.TabReparentingController;
import org.chromium.chrome.browser.app.tabmodel.TabWindowManagerSingleton;
@@ -499,7 +500,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -496,7 +497,8 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return ret;
}
},
@@ -1163,7 +1163,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/webapps/WebappI
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
@@ -4465,6 +4465,10 @@ const FeatureEntry kFeatureEntries[] = {
@@ -4706,6 +4706,10 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kOfflinePagesLivePageSharingName,
flag_descriptions::kOfflinePagesLivePageSharingDescription, kOsAndroid,
FEATURE_VALUE_TYPE(offline_pages::kOfflinePagesLivePageSharingFeature)},
@@ -1237,7 +1237,7 @@ diff --git a/chrome/browser/android/historical_tab_saver.cc b/chrome/browser/and
diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
--- a/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
+++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
@@ -330,6 +330,13 @@ ChromeAutocompleteProviderClient::GetAutocompleteScoringModelService() const {
@@ -332,6 +332,13 @@ ChromeAutocompleteProviderClient::GetAutocompleteScoringModelService() const {
#endif // BUILDFLAG(BUILD_WITH_TFLITE_LIB)
}
@@ -1311,7 +1311,7 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.c
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -3852,6 +3852,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
@@ -3891,6 +3891,12 @@ const char kOfflinePagesLivePageSharingDescription[] =
"Enables to share current loaded page as offline page by saving as MHTML "
"first.";
@@ -1327,7 +1327,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -2206,6 +2206,9 @@ extern const char kNotificationPermissionRationaleBottomSheetDescription[];
@@ -2238,6 +2238,9 @@ extern const char kNotificationPermissionRationaleBottomSheetDescription[];
extern const char kOfflinePagesLivePageSharingName[];
extern const char kOfflinePagesLivePageSharingDescription[];
@@ -1340,7 +1340,7 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
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
@@ -541,8 +541,8 @@ BASE_FEATURE(kCCTFeatureUsage,
@@ -556,8 +556,8 @@ BASE_FEATURE(kCCTFeatureUsage,
BASE_FEATURE(kCCTIncognito, "CCTIncognito", base::FEATURE_ENABLED_BY_DEFAULT);
BASE_FEATURE(kCCTIncognitoAvailableToThirdParty,
@@ -1534,17 +1534,24 @@ diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc
namespace network {
class NetworkQualityTracker;
}
@@ -61,7 +67,8 @@ class ActiveTabInfo : public RequestCoordinator::ActiveTabInfo {
@@ -61,14 +67,8 @@ class ActiveTabInfo : public RequestCoordinator::ActiveTabInfo {
};
RequestCoordinatorFactory::RequestCoordinatorFactory()
- : ProfileKeyedServiceFactory("OfflineRequestCoordinator") {
- : ProfileKeyedServiceFactory(
- "OfflineRequestCoordinator",
- ProfileSelections::Builder()
- .WithRegular(ProfileSelection::kOriginalOnly)
- // TODO(crbug.com/1418376): Check if this service is needed in
- // Guest mode.
- .WithGuest(ProfileSelection::kOriginalOnly)
- .Build()) {
+ : BrowserContextKeyedServiceFactory("OfflineRequestCoordinator",
+ BrowserContextDependencyManager::GetInstance()) {
// Depends on OfflinePageModelFactory in SimpleDependencyManager.
}
@@ -79,6 +86,12 @@ RequestCoordinator* RequestCoordinatorFactory::GetForBrowserContext(
@@ -86,6 +86,12 @@ RequestCoordinator* RequestCoordinatorFactory::GetForBrowserContext(
KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
@@ -1557,7 +1564,7 @@ diff --git a/chrome/browser/offline_pages/android/request_coordinator_factory.cc
std::unique_ptr<OfflinerPolicy> policy(new OfflinerPolicy());
std::unique_ptr<Offliner> offliner;
OfflinePageModel* model =
@@ -111,4 +124,16 @@ KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor(
@@ -118,4 +124,16 @@ KeyedService* RequestCoordinatorFactory::BuildServiceInstanceFor(
return request_coordinator;
}
@@ -1665,7 +1672,7 @@ diff --git a/chrome/browser/offline_pages/request_coordinator_factory.h b/chrome
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
@@ -234,6 +234,7 @@
@@ -237,6 +237,7 @@
#include "components/feed/core/shared_prefs/pref_names.h"
#if BUILDFLAG(IS_ANDROID)
@@ -1673,7 +1680,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
#include "chrome/browser/android/explore_sites/history_statistics_reporter.h"
#include "chrome/browser/android/ntp/recent_tabs_page_prefs.h"
@@ -1468,6 +1469,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1528,6 +1529,10 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
usage_stats::UsageStatsBridge::RegisterProfilePrefs(registry);
variations::VariationsService::RegisterProfilePrefs(registry);
video_tutorials::RegisterPrefs(registry);
@@ -1682,8 +1689,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
+ /*default_value=*/false);
+ HistoryTabHelper::RegisterProfilePrefs(registry);
#else // BUILDFLAG(IS_ANDROID)
bookmarks_webui::RegisterProfilePrefs(registry);
browser_sync::ForeignSessionHandler::RegisterProfilePrefs(registry);
BrowserFeaturePromoSnoozeService::RegisterProfilePrefs(registry);
diff --git a/chrome/browser/ui/android/native_page/BUILD.gn b/chrome/browser/ui/android/native_page/BUILD.gn
--- a/chrome/browser/ui/android/native_page/BUILD.gn
+++ b/chrome/browser/ui/android/native_page/BUILD.gn
@@ -1747,7 +1754,7 @@ diff --git a/chrome/browser/ui/android/native_page/java/src/org/chromium/chrome/
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1291,6 +1291,37 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1294,6 +1294,37 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_CLEAR_BROWSING_HISTORY_SUMMARY_SYNCED_NO_LINK" desc="A text for the basic tab explaining browsing history for users with history sync. This version is shown when the link to MyActivity is displayed separately.">
Clears history from all synced devices.
</message>
@@ -1869,7 +1876,7 @@ new file mode 100644
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -3438,6 +3438,12 @@ const char kLacrosLaunchSwitch[] = "lacros_launch_switch";
@@ -3373,6 +3373,12 @@ const char kLacrosLaunchSwitch[] = "lacros_launch_switch";
const char kLacrosSelection[] = "lacros_selection";
#endif
@@ -1885,7 +1892,7 @@ diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -1226,6 +1226,8 @@ extern const char kDiscountConsentShowInterestIn[];
@@ -1208,6 +1208,8 @@ extern const char kDiscountConsentShowInterestIn[];
#if BUILDFLAG(IS_ANDROID)
extern const char kWebXRImmersiveArEnabled[];
@@ -1894,7 +1901,7 @@ diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
#endif
#if !BUILDFLAG(IS_ANDROID)
@@ -1264,6 +1266,10 @@ extern const char kPrivacyGuideViewed[];
@@ -1247,6 +1249,10 @@ extern const char kPrivacyGuideViewed[];
extern const char kCorsNonWildcardRequestHeadersSupport[];
@@ -2053,7 +2060,7 @@ diff --git a/components/omnibox/browser/autocomplete_provider_client.h b/compone
diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc
--- a/components/omnibox/browser/base_search_provider.cc
+++ b/components/omnibox/browser/base_search_provider.cc
@@ -323,7 +323,7 @@ bool BaseSearchProvider::CanSendZeroSuggestRequest(
@@ -295,7 +295,7 @@ bool BaseSearchProvider::CanSendZeroSuggestRequest(
}
// Don't make a suggest request if in incognito mode.
@@ -2065,7 +2072,7 @@ diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omn
diff --git a/components/omnibox/browser/search_provider.cc b/components/omnibox/browser/search_provider.cc
--- a/components/omnibox/browser/search_provider.cc
+++ b/components/omnibox/browser/search_provider.cc
@@ -786,7 +786,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const {
@@ -788,7 +788,9 @@ bool SearchProvider::IsQuerySuitableForSuggest(bool* query_is_private) const {
// keyword input to a keyword suggest server, if any.)
const TemplateURL* default_url = providers_.GetDefaultProviderURL();
const TemplateURL* keyword_url = providers_.GetKeywordProviderURL();
build/patches/Add-bookmark-import-export-actions.patch
+124 -122
View File
@@ -11,14 +11,14 @@ Requires patch: Adds-support-for-writing-URIs.patch
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
chrome/android/java/AndroidManifest.xml | 1 -
.../res/menu/bookmark_action_bar_menu.xml | 14 +
.../java/res/menu/bookmark_toolbar_menu.xml | 14 +
.../browser/TabbedModeTabDelegateFactory.java | 5 +-
.../app/bookmarks/BookmarkActivity.java | 31 ++
.../browser/bookmarks/BookmarkActionBar.java | 12 +
.../browser/bookmarks/BookmarkBridge.java | 278 +++++++++++++++++
.../browser/bookmarks/BookmarkDelegate.java | 10 +
.../browser/bookmarks/BookmarkManager.java | 22 ++
.../bookmarks/BookmarkManagerMediator.java | 23 ++
.../browser/bookmarks/BookmarkPage.java | 8 +-
.../browser/bookmarks/BookmarkToolbar.java | 12 +
.../native_page/NativePageFactory.java | 11 +-
chrome/browser/BUILD.gn | 11 +-
chrome/browser/about_flags.cc | 6 +
@@ -45,7 +45,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
ui/shell_dialogs/select_file_dialog.h | 2 +
.../select_file_dialog_android.cc | 6 +
ui/shell_dialogs/select_file_dialog_android.h | 2 +
35 files changed, 848 insertions(+), 29 deletions(-)
35 files changed, 849 insertions(+), 29 deletions(-)
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
@@ -58,9 +58,9 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
<uses-permission-sdk-23 android:name="android.permission.REORDER_TASKS"/>
<uses-permission-sdk-23 android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
--- a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
+++ b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
--- a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
+++ b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
@@ -23,6 +23,20 @@ found in the LICENSE file.
android:visible="false"
app:showAsAction="ifRoom"
@@ -93,7 +93,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
import org.chromium.chrome.browser.app.tab_activity_glue.ActivityTabWebContentsDelegateAndroid;
import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -48,7 +49,7 @@ import java.util.function.BooleanSupplier;
@@ -47,7 +48,7 @@ import java.util.function.BooleanSupplier;
* {@link ChromeTabbedActivity}.
*/
public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
@@ -102,7 +102,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
private final BrowserControlsVisibilityDelegate mAppBrowserControlsVisibilityDelegate;
private final Supplier<ShareDelegate> mShareDelegateSupplier;
private final Supplier<EphemeralTabCoordinator> mEphemeralTabCoordinatorSupplier;
@@ -75,7 +76,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
@@ -73,7 +74,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory {
private NativePageFactory mNativePageFactory;
@@ -114,8 +114,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDe
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/BookmarkActivity.java
@@ -19,6 +19,11 @@ import org.chromium.chrome.browser.bookmarks.BookmarkManager;
import org.chromium.chrome.browser.bookmarks.BookmarkPage;
@@ -18,6 +18,11 @@ import org.chromium.chrome.browser.bookmarks.BookmarkPage;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.components.bookmarks.BookmarkId;
import org.chromium.components.embedder_support.util.UrlConstants;
+import org.chromium.ui.base.ActivityWindowAndroid;
@@ -125,7 +125,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
+import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
/**
* The activity that displays the bookmark UI on the phone. It keeps a {@link BookmarkManager}
* The activity that displays the bookmark UI on the phone. It keeps a {@link
@@ -30,6 +35,8 @@ public class BookmarkActivity extends SnackbarActivity {
public static final int EDIT_BOOKMARK_REQUEST_CODE = 14;
public static final String INTENT_VISIT_BOOKMARK_ID = "BookmarkEditActivity.VisitBookmarkId";
@@ -137,7 +137,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
super.onCreate(savedInstanceState);
@@ -49,8 +56,23 @@ public class BookmarkActivity extends SnackbarActivity {
BackPressHelper.create(
this, getOnBackPressedDispatcher(), mBookmarkManager::onBackPressed);
this, getOnBackPressedDispatcher(), mBookmarkManagerCoordinator::onBackPressed);
}
+
+ final boolean listenToActivityState = true;
@@ -180,51 +180,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/bookmarks/B
+ }
+
/**
* @return The {@link BookmarkManager} for testing purposes.
* @return The {@link BookmarkManagerCoordinator} for testing purposes.
*/
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
@@ -84,6 +84,12 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
} else if (menuItem.getItemId() == R.id.search_menu_id) {
mDelegate.openSearchUI();
return true;
+ } else if (menuItem.getItemId() == R.id.import_menu_id) {
+ mDelegate.importBookmarks();
+ return true;
+ } else if (menuItem.getItemId() == R.id.export_menu_id) {
+ mDelegate.exportBookmarks();
+ return true;
}
SelectionDelegate<BookmarkId> selectionDelegate = mDelegate.getSelectionDelegate();
@@ -147,6 +153,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
void showLoadingUi() {
setTitle(null);
setNavigationButton(NAVIGATION_BUTTON_NONE);
+ getMenu().findItem(R.id.import_menu_id).setVisible(false);
+ getMenu().findItem(R.id.export_menu_id).setVisible(false);
getMenu().findItem(R.id.search_menu_id).setVisible(false);
getMenu().findItem(R.id.edit_menu_id).setVisible(false);
}
@@ -156,6 +164,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
super.showNormalView();
if (mDelegate == null) {
+ getMenu().findItem(R.id.import_menu_id).setVisible(false);
+ getMenu().findItem(R.id.export_menu_id).setVisible(false);
getMenu().findItem(R.id.search_menu_id).setVisible(false);
getMenu().findItem(R.id.edit_menu_id).setVisible(false);
}
@@ -185,6 +195,8 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
@Override
public void onFolderStateSet(BookmarkId folder) {
mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
+ getMenu().findItem(R.id.import_menu_id).setVisible(true);
+ getMenu().findItem(R.id.export_menu_id).setVisible(true);
getMenu().findItem(R.id.search_menu_id).setVisible(true);
getMenu().findItem(R.id.edit_menu_id).setVisible(mCurrentFolder.isEditable());
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkBridge.java
@@ -249,8 +206,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
import android.text.TextUtils;
import android.util.Pair;
@@ -45,6 +58,32 @@ import java.util.ArrayList;
import java.util.HashSet;
@@ -36,6 +49,32 @@ import org.chromium.url.GURL;
import java.util.ArrayList;
import java.util.List;
+import org.chromium.base.ContentUriUtils;
@@ -282,7 +239,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* Provides the communication channel for Android to fetch and manipulate the
* bookmark model stored in native.
@@ -425,6 +464,209 @@ class BookmarkBridge {
@@ -415,6 +454,209 @@ class BookmarkBridge {
mNativeBookmarkBridge, BookmarkBridge.this, id.getId(), id.getType());
}
@@ -492,7 +449,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* Synchronously gets a list of bookmarks that match the specified search query.
* @param query Keyword used for searching bookmarks.
@@ -909,6 +1151,39 @@ class BookmarkBridge {
@@ -899,6 +1141,39 @@ class BookmarkBridge {
depthList.add(depth);
}
@@ -530,9 +487,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
+ }
+
private static List<Pair<Integer, Integer>> createPairsList(int[] left, int[] right) {
List<Pair<Integer, Integer>> pairList = new ArrayList<Pair<Integer, Integer>>();
List<Pair<Integer, Integer>> pairList = new ArrayList<>();
for (int i = 0; i < left.length; i++) {
@@ -942,6 +1217,9 @@ class BookmarkBridge {
@@ -932,6 +1207,9 @@ class BookmarkBridge {
int getChildCount(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type);
void getChildIDs(long nativeBookmarkBridge, BookmarkBridge caller, long id, int type,
List<BookmarkId> bookmarksList);
@@ -545,9 +502,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkDelegate.java
@@ -75,6 +75,16 @@ public interface BookmarkDelegate {
@@ -65,6 +65,16 @@ public interface BookmarkDelegate {
*/
void openSearchUI();
void openSearchUi();
+ /**
+ * Imports bookmarks from user-selected file.
@@ -562,28 +519,29 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
/**
* Dismisses the search UI.
*/
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManager.java
@@ -38,6 +38,8 @@ import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate;
import org.chromium.components.browser_ui.widget.gesture.BackPressHandler;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkManagerMediator.java
@@ -37,6 +37,8 @@ import org.chromium.components.browser_ui.widget.dragreorder.DragStateDelegate;
import org.chromium.components.browser_ui.widget.selectable_list.SelectableListLayout;
import org.chromium.components.browser_ui.widget.selectable_list.SelectableListToolbar.SearchDelegate;
import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate.SelectionObserver;
+import org.chromium.ui.base.ActivityWindowAndroid;
+import org.chromium.ui.modaldialog.ModalDialogManager;
import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
import org.chromium.components.favicon.LargeIconBridge;
import org.chromium.url.GURL;
@@ -61,6 +63,8 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
private Context mContext;
private ViewGroup mMainView;
private BookmarkModel mBookmarkModel;
import org.chromium.components.feature_engagement.EventConstants;
import org.chromium.ui.modelutil.PropertyModel;
@@ -56,6 +58,9 @@ class BookmarkManagerMediator implements BookmarkDelegate, TestingDelegate,
private static boolean sPreventLoadingForTesting;
+ private ActivityWindowAndroid mWindowAndroid;
+ private ModalDialogManager mModalDialogManager;
private BookmarkUndoController mUndoController;
private final ObserverList<BookmarkUIObserver> mUIObservers = new ObserverList<>();
private BasicNativePage mNativePage;
@@ -394,6 +398,14 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
+
/**
* Keeps track of whether drag is enabled / active for bookmark lists.
*/
@@ -446,6 +451,14 @@ class BookmarkManagerMediator implements BookmarkDelegate, TestingDelegate,
mNativePage = nativePage;
}
@@ -596,9 +554,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
+ }
+
/**
* @return Current URL representing the UI state of bookmark manager. If no state has been shown
* yet in this session, on phone return last used state stored in preference; on tablet
@@ -578,6 +590,16 @@ public class BookmarkManager implements BookmarkDelegate, SearchDelegate,
* See BookmarkManager(Coordinator)#updateForUrl
*/
@@ -662,6 +675,16 @@ class BookmarkManagerMediator implements BookmarkDelegate, TestingDelegate,
}
}
@@ -613,12 +571,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
+ }
+
@Override
public void openSearchUI() {
setState(BookmarkUIState.createSearchState());
public void openSearchUi() {
setState(BookmarkUiState.createSearchState());
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkPage.java
@@ -13,6 +13,9 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
@@ -14,6 +14,9 @@ import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager;
import org.chromium.chrome.browser.ui.native_page.BasicNativePage;
import org.chromium.chrome.browser.ui.native_page.NativePageHost;
import org.chromium.components.embedder_support.util.UrlConstants;
@@ -627,8 +585,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
+import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
/**
* A native page holding a {@link BookmarkManager} on _tablet_.
@@ -29,12 +32,15 @@ public class BookmarkPage extends BasicNativePage {
* A native page holding a {@link BookmarkManagerCoordinator} on _tablet_.
@@ -30,13 +33,16 @@ public class BookmarkPage extends BasicNativePage {
* @param host A NativePageHost to load urls.
*/
public BookmarkPage(ComponentName componentName, SnackbarManager snackbarManager,
@@ -636,15 +594,59 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
+ boolean isIncognito, NativePageHost host, ChromeActivity activity) {
super(host);
mManager = new BookmarkManager(
host.getContext(), componentName, false, isIncognito, snackbarManager);
mManager.setBasicNativePage(this);
mBookmarkManagerCoordinator =
new BookmarkManagerCoordinator(host.getContext(), componentName, false, isIncognito,
snackbarManager, Profile.getLastUsedRegularProfile());
mBookmarkManagerCoordinator.setBasicNativePage(this);
+ mManager.setWindow(activity.getWindowAndroid(),
+ new ModalDialogManager(
+ new AppModalPresenter(activity), ModalDialogManager.ModalDialogType.APP));
mTitle = host.getContext().getResources().getString(R.string.bookmarks);
initWithView(mManager.getView());
initWithView(mBookmarkManagerCoordinator.getView());
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
@@ -138,6 +138,8 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
void setCurrentFolder(BookmarkItem folder) {
mCurrentFolder = folder;
+ getMenu().findItem(R.id.import_menu_id).setVisible(true);
+ getMenu().findItem(R.id.export_menu_id).setVisible(true);
getMenu().findItem(R.id.search_menu_id).setVisible(true);
getMenu().findItem(R.id.edit_menu_id).setVisible(mCurrentFolder.isEditable());
@@ -172,6 +174,8 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
void showLoadingUi() {
setTitle(null);
setNavigationButton(NAVIGATION_BUTTON_NONE);
+ getMenu().findItem(R.id.import_menu_id).setVisible(false);
+ getMenu().findItem(R.id.export_menu_id).setVisible(false);
getMenu().findItem(R.id.search_menu_id).setVisible(false);
getMenu().findItem(R.id.edit_menu_id).setVisible(false);
}
@@ -192,6 +196,12 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
} else if (menuItem.getItemId() == R.id.search_menu_id) {
mOpenSearchUiRunnable.run();
return true;
+ } else if (menuItem.getItemId() == R.id.import_menu_id) {
+ mDelegate.importBookmarks();
+ return true;
+ } else if (menuItem.getItemId() == R.id.export_menu_id) {
+ mDelegate.exportBookmarks();
+ return true;
}
if (menuItem.getItemId() == R.id.selection_mode_edit_menu_id) {
@@ -271,6 +281,8 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
super.showNormalView();
if (mCurrentFolder == null) {
+ getMenu().findItem(R.id.import_menu_id).setVisible(false);
+ getMenu().findItem(R.id.export_menu_id).setVisible(false);
getMenu().findItem(R.id.search_menu_id).setVisible(false);
getMenu().findItem(R.id.edit_menu_id).setVisible(false);
} else {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/native_page/NativePageFactory.java
@@ -656,7 +658,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
import org.chromium.chrome.browser.app.download.home.DownloadPage;
import org.chromium.chrome.browser.bookmarks.BookmarkPage;
import org.chromium.chrome.browser.browser_controls.BrowserControlsMarginSupplier;
@@ -52,7 +53,7 @@ import java.util.function.BooleanSupplier;
@@ -51,7 +52,7 @@ import java.util.function.BooleanSupplier;
* Creates NativePage objects to show chrome-native:// URLs using the native Android view system.
*/
public class NativePageFactory {
@@ -665,7 +667,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
private final BottomSheetController mBottomSheetController;
private final BrowserControlsManager mBrowserControlsManager;
private final Supplier<Tab> mCurrentTabSupplier;
@@ -70,7 +71,7 @@ public class NativePageFactory {
@@ -68,7 +69,7 @@ public class NativePageFactory {
private NativePageBuilder mNativePageBuilder;
@@ -674,7 +676,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
@NonNull BottomSheetController sheetController,
@NonNull BrowserControlsManager browserControlsManager,
@NonNull Supplier<Tab> currentTabSupplier,
@@ -121,7 +122,7 @@ public class NativePageFactory {
@@ -116,7 +117,7 @@ public class NativePageFactory {
@VisibleForTesting
static class NativePageBuilder {
@@ -683,16 +685,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
private final BottomSheetController mBottomSheetController;
private final Supplier<NewTabPageUma> mUma;
private final BrowserControlsManager mBrowserControlsManager;
@@ -135,7 +136,7 @@ public class NativePageFactory {
@@ -129,7 +130,7 @@ public class NativePageFactory {
private final JankTracker mJankTracker;
private final Supplier<Toolbar> mToolbarSupplier;
private final CrowButtonDelegate mCrowButtonDelegate;
- public NativePageBuilder(Activity activity, Supplier<NewTabPageUma> uma,
+ public NativePageBuilder(ChromeActivity activity, Supplier<NewTabPageUma> uma,
BottomSheetController sheetController,
BrowserControlsManager browserControlsManager, Supplier<Tab> currentTabSupplier,
Supplier<SnackbarManager> snackbarManagerSupplier,
@@ -174,7 +175,7 @@ public class NativePageFactory {
@@ -166,7 +167,7 @@ public class NativePageFactory {
protected NativePage buildBookmarksPage(Tab tab) {
return new BookmarkPage(mActivity.getComponentName(), mSnackbarManagerSupplier.get(),
mTabModelSelector.isIncognitoSelected(),
@@ -704,7 +706,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/native_page/Nat
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -202,6 +202,8 @@ static_library("browser") {
@@ -198,6 +198,8 @@ static_library("browser") {
"bluetooth/chrome_bluetooth_delegate_impl_client.h",
"bookmarks/bookmark_model_factory.cc",
"bookmarks/bookmark_model_factory.h",
@@ -713,7 +715,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"bookmarks/chrome_bookmark_client.cc",
"bookmarks/chrome_bookmark_client.h",
"bookmarks/managed_bookmark_service_factory.cc",
@@ -1878,6 +1880,13 @@ static_library("browser") {
@@ -1833,6 +1835,13 @@ static_library("browser") {
"webid/federated_identity_permission_context_factory.h",
]
@@ -727,7 +729,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
configs += [
"//build/config/compiler:wexit_time_destructors",
"//build/config:precompiled_headers",
@@ -3477,8 +3486,6 @@ static_library("browser") {
@@ -3438,8 +3447,6 @@ static_library("browser") {
"badging/badge_manager_factory.h",
"banners/app_banner_manager_desktop.cc",
"banners/app_banner_manager_desktop.h",
@@ -739,7 +741,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
@@ -8463,6 +8463,12 @@ const FeatureEntry kFeatureEntries[] = {
@@ -8785,6 +8785,12 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kRequestDesktopSiteExceptions)},
#endif
@@ -1251,7 +1253,7 @@ diff --git a/chrome/browser/download/android/java/src/org/chromium/chrome/browse
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -6634,6 +6634,11 @@ const char kPromiseIconsDescription[] =
@@ -6790,6 +6790,11 @@ const char kPromiseIconsDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1266,7 +1268,7 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -3854,6 +3854,9 @@ extern const char kPromiseIconsDescription[];
@@ -3951,6 +3951,9 @@ extern const char kPromiseIconsDescription[];
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1279,15 +1281,15 @@ diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptio
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
@@ -177,6 +177,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -181,6 +181,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kCastDeviceFilter,
&kClearOmniboxFocusAfterNavigation,
&kCloseTabSuggestions,
+ &kBookmarksExportUseSaf,
&kCriticalPersistedTabData,
&kCommerceCoupons,
&kCCTBackgroundTab,
@@ -1083,6 +1084,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent,
&kCCTAllowCrossUidActivitySwitchFromBelow,
@@ -1119,6 +1120,11 @@ BASE_FEATURE(kWebApkTrampolineOnInitialIntent,
"WebApkTrampolineOnInitialIntent",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1302,7 +1304,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -161,6 +161,7 @@ BASE_DECLARE_FEATURE(kTabStripImprovements);
@@ -168,6 +168,7 @@ BASE_DECLARE_FEATURE(kTabStripImprovements);
BASE_DECLARE_FEATURE(kDiscoverFeedMultiColumn);
BASE_DECLARE_FEATURE(kTabStripRedesign);
BASE_DECLARE_FEATURE(kTabToGTSAnimation);
@@ -1313,14 +1315,14 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -545,6 +545,7 @@ public abstract class ChromeFeatureList {
@@ -558,6 +558,7 @@ public abstract class ChromeFeatureList {
public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =
"UseLibunwindstackNativeUnwinderAndroid";
public static final String VIDEO_TUTORIALS = "VideoTutorials";
+ public static final String BOOKMARKS_EXPORT_USESAF = "BookmarksExportUseSaf";
public static final String VOICE_BUTTON_IN_TOP_TOOLBAR = "VoiceButtonInTopToolbar";
public static final String VOICE_SEARCH_AUDIO_CAPTURE_POLICY = "VoiceSearchAudioCapturePolicy";
public static final String WEBNOTES_DYNAMIC_TEMPLATES = "WebNotesDynamicTemplates";
public static final String WEBNOTES_STYLIZE = "WebNotesStylize";
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc
--- a/chrome/browser/importer/profile_writer.cc
+++ b/chrome/browser/importer/profile_writer.cc
@@ -1382,7 +1384,7 @@ diff --git a/chrome/browser/importer/profile_writer.h b/chrome/browser/importer/
diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
--- a/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
+++ b/chrome/browser/preferences/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceKeys.java
@@ -113,6 +113,8 @@ public final class ChromePreferenceKeys {
@@ -106,6 +106,8 @@ public final class ChromePreferenceKeys {
public static final String BOOKMARKS_LAST_USED_URL = "enhanced_bookmark_last_used_url";
public static final String BOOKMARKS_LAST_USED_PARENT =
"enhanced_bookmark_last_used_parent_folder";
@@ -1391,7 +1393,7 @@ diff --git a/chrome/browser/preferences/android/java/src/org/chromium/chrome/bro
/**
* Whether Chrome is set as the default browser.
@@ -1011,6 +1013,7 @@ public final class ChromePreferenceKeys {
@@ -1002,6 +1004,7 @@ public final class ChromePreferenceKeys {
AUTOFILL_ASSISTANT_PROACTIVE_HELP_ENABLED,
APP_LAUNCH_LAST_KNOWN_ACTIVE_TAB_STATE,
APP_LAUNCH_SEARCH_ENGINE_HAD_LOGO,
@@ -1430,7 +1432,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -401,6 +401,9 @@ static_library("common_lib") {
@@ -402,6 +402,9 @@ static_library("common_lib") {
sources += [
"media/chrome_media_drm_bridge_client.cc",
"media/chrome_media_drm_bridge_client.h",
@@ -1567,7 +1569,7 @@ diff --git a/chrome/utility/importer/bookmark_html_reader.h b/chrome/utility/imp
diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
--- a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
+++ b/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java
@@ -41,6 +41,7 @@ import org.chromium.base.task.AsyncTask;
@@ -44,6 +44,7 @@ import org.chromium.base.task.AsyncTask;
import org.chromium.base.task.PostTask;
import org.chromium.base.task.TaskTraits;
import org.chromium.ui.R;
@@ -1575,7 +1577,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
import org.chromium.ui.UiUtils;
import org.chromium.ui.permissions.PermissionConstants;
@@ -64,6 +65,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
@@ -67,6 +68,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
private static final String TAG = "SelectFileDialog";
private static final String IMAGE_TYPE = "image";
private static final String VIDEO_TYPE = "video";
@@ -1583,7 +1585,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
private static final String AUDIO_TYPE = "audio";
private static final String ALL_TYPES = "*/*";
@@ -258,6 +260,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
@@ -262,6 +264,11 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
mFileTypes = fileTypes;
}
@@ -1595,7 +1597,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
/**
* Creates and starts an intent based on the passed fileTypes and capture value.
* @param fileTypes MIME types requested (i.e. "image/*")
@@ -284,7 +291,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
@@ -288,7 +295,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
List<String> missingPermissions = new ArrayList<>();
String storagePermission = Manifest.permission.READ_EXTERNAL_STORAGE;
boolean shouldUsePhotoPicker = shouldUsePhotoPicker();
@@ -1604,7 +1606,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
// The permission scenario for accessing media has evolved a bit over the years:
// Early on, READ_EXTERNAL_STORAGE was required to access media, but that permission was
// later deprecated. In its place (starting with Android T) READ_MEDIA_IMAGES and
@@ -333,7 +340,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
@@ -337,7 +344,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
}
// TODO(finnur): Remove once we figure out the cause of crbug.com/950024.
@@ -1613,7 +1615,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
if (permissions.length != requestPermissions.length) {
throw new RuntimeException(
String.format("Permissions arrays misaligned: %d != %d",
@@ -347,7 +354,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
@@ -351,7 +358,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
}
}
@@ -1622,7 +1624,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
if (permissions[i].equals(storagePermission)
|| permissions[i].equals(PermissionConstants.READ_MEDIA_IMAGES)
|| permissions[i].equals(
@@ -553,6 +560,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
@@ -570,6 +577,7 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
}
if (!mimeTypes.contains(mimeType)) mimeTypes.add(mimeType);
}
@@ -1630,7 +1632,7 @@ diff --git a/ui/android/java/src/org/chromium/ui/base/SelectFileDialog.java b/ui
return mimeTypes;
}
@@ -881,6 +889,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
@@ -898,6 +906,10 @@ public class SelectFileDialog implements WindowAndroid.IntentCallback, PhotoPick
return countAcceptTypesFor(superType) == mFileTypes.size();
}
build/patches/Bookmarks-select-all-menu-entry.patch
+30 -30
View File
@@ -4,14 +4,14 @@ Subject: Bookmarks select all menu entry
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../java/res/menu/bookmark_action_bar_menu.xml | 7 +++++++
.../browser/bookmarks/BookmarkActionBar.java | 15 +++++++++++++++
.../java/res/menu/bookmark_toolbar_menu.xml | 7 +++++++
.../chrome/browser/bookmarks/BookmarkToolbar.java | 15 +++++++++++++++
.../ui/android/strings/android_chrome_strings.grd | 3 +++
3 files changed, 25 insertions(+)
diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
--- a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
+++ b/chrome/android/java/res/menu/bookmark_action_bar_menu.xml
diff --git a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
--- a/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
+++ b/chrome/android/java/res/menu/bookmark_toolbar_menu.xml
@@ -23,6 +23,13 @@ found in the LICENSE file.
android:visible="false"
app:showAsAction="ifRoom"
@@ -26,20 +26,36 @@ diff --git a/chrome/android/java/res/menu/bookmark_action_bar_menu.xml b/chrome/
<item
android:id="@+id/import_menu_id"
android:icon="@drawable/ic_folder_blue_24dp"
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkActionBar.java
@@ -27,6 +27,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectableListT
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkToolbar.java
@@ -29,6 +29,7 @@ import org.chromium.components.browser_ui.widget.selectable_list.SelectableListT
import org.chromium.components.browser_ui.widget.selectable_list.SelectionDelegate;
import java.util.List;
+import java.util.HashSet;
/**
* Main action bar of bookmark UI. It is responsible for displaying title and buttons
@@ -144,6 +145,17 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
* Main toolbar of bookmark UI. It is responsible for displaying title and buttons
@@ -138,6 +139,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
void setCurrentFolder(BookmarkItem folder) {
mCurrentFolder = folder;
+ getMenu().findItem(R.id.select_all_menu_id).setVisible(true);
getMenu().findItem(R.id.import_menu_id).setVisible(true);
getMenu().findItem(R.id.export_menu_id).setVisible(true);
getMenu().findItem(R.id.search_menu_id).setVisible(true);
@@ -174,6 +176,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
void showLoadingUi() {
setTitle(null);
setNavigationButton(NAVIGATION_BUTTON_NONE);
+ getMenu().findItem(R.id.select_all_menu_id).setVisible(false);
getMenu().findItem(R.id.import_menu_id).setVisible(false);
getMenu().findItem(R.id.export_menu_id).setVisible(false);
getMenu().findItem(R.id.search_menu_id).setVisible(false);
@@ -258,6 +261,17 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
}
selectionDelegate.clearSelection();
mSelectionDelegate.clearSelection();
return true;
+ } else if (menuItem.getItemId() == R.id.select_all_menu_id) {
+ BookmarkModel bookmarkModel = mDelegate.getModel();
@@ -55,30 +71,14 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/bookmarks/Bookm
}
assert false : "Unhandled menu click.";
@@ -153,6 +165,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
void showLoadingUi() {
setTitle(null);
setNavigationButton(NAVIGATION_BUTTON_NONE);
+ getMenu().findItem(R.id.select_all_menu_id).setVisible(false);
getMenu().findItem(R.id.import_menu_id).setVisible(false);
getMenu().findItem(R.id.export_menu_id).setVisible(false);
getMenu().findItem(R.id.search_menu_id).setVisible(false);
@@ -164,6 +177,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
@@ -281,6 +295,7 @@ public class BookmarkToolbar extends SelectableListToolbar<BookmarkId>
super.showNormalView();
if (mDelegate == null) {
if (mCurrentFolder == null) {
+ getMenu().findItem(R.id.select_all_menu_id).setVisible(false);
getMenu().findItem(R.id.import_menu_id).setVisible(false);
getMenu().findItem(R.id.export_menu_id).setVisible(false);
getMenu().findItem(R.id.search_menu_id).setVisible(false);
@@ -195,6 +209,7 @@ public class BookmarkActionBar extends SelectableListToolbar<BookmarkId>
@Override
public void onFolderStateSet(BookmarkId folder) {
mCurrentFolder = mDelegate.getModel().getBookmarkById(folder);
+ getMenu().findItem(R.id.select_all_menu_id).setVisible(true);
getMenu().findItem(R.id.import_menu_id).setVisible(true);
getMenu().findItem(R.id.export_menu_id).setVisible(true);
getMenu().findItem(R.id.search_menu_id).setVisible(true);
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
build/patches/Disable-safe-browsing.patch
+144 -143
View File
@@ -57,7 +57,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../PrivacyGuidePagerAdapter.java | 2 -
.../privacy_guide/PrivacyGuideUtils.java | 6 +-
.../privacy_guide/StepDisplayHandlerImpl.java | 2 +-
...hrome_browser_main_extra_parts_profiles.cc | 10 +-
...hrome_browser_main_extra_parts_profiles.cc | 11 +--
chrome/browser/profiles/profile_impl.cc | 4 +-
chrome/browser/safe_browsing/BUILD.gn | 4 +-
chrome/browser/safe_browsing/android/BUILD.gn | 5 -
@@ -98,7 +98,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../file_system_access_permission_context.h | 6 --
weblayer/BUILD.gn | 4 -
weblayer/test/BUILD.gn | 1 -
89 files changed, 213 insertions(+), 749 deletions(-)
89 files changed, 213 insertions(+), 750 deletions(-)
diff --git a/chrome/android/java/res/xml/google_services_preferences.xml b/chrome/android/java/res/xml/google_services_preferences.xml
--- a/chrome/android/java/res/xml/google_services_preferences.xml
@@ -159,7 +159,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences.xml b/chrome/androi
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
@@ -30,15 +30,11 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxBridge;
@@ -31,15 +31,11 @@ import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxBridge;
import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxReferrer;
import org.chromium.chrome.browser.privacy_sandbox.PrivacySandboxSettingsBaseFragment;
import org.chromium.chrome.browser.profiles.Profile;
@@ -175,7 +175,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
import org.chromium.components.browser_ui.settings.ChromeSwitchPreference;
import org.chromium.components.browser_ui.settings.SettingsLauncher;
import org.chromium.components.browser_ui.settings.SettingsUtils;
@@ -60,9 +56,7 @@ public class PrivacySettings
@@ -61,9 +57,7 @@ public class PrivacySettings extends PreferenceFragmentCompat
private static final String PREF_PRELOAD_PAGES = "preload_pages";
private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
private static final String PREF_SECURE_DNS = "secure_dns";
@@ -185,7 +185,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
private static final String PREF_SYNC_AND_SERVICES_LINK = "sync_and_services_link";
private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data";
private static final String PREF_PRIVACY_SANDBOX = "privacy_sandbox";
@@ -115,15 +109,6 @@ public class PrivacySettings
@@ -117,15 +111,6 @@ public class PrivacySettings extends PreferenceFragmentCompat
mIncognitoLockSettings = new IncognitoLockSettings(incognitoReauthPreference);
mIncognitoLockSettings.setUpIncognitoReauthPreference(getActivity());
@@ -201,8 +201,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
setHasOptionsMenu(true);
ChromeSwitchPreference canMakePaymentPref =
@@ -148,16 +133,11 @@ public class PrivacySettings
public boolean isPreferenceClickDisabledByPolicy(Preference preference) {
@@ -150,16 +135,11 @@ public class PrivacySettings extends PreferenceFragmentCompat
public boolean isPreferenceClickDisabled(Preference preference) {
// Advanced Protection automatically enables HTTPS-Only Mode so
// lock the setting.
- return isPreferenceControlledByPolicy(preference)
@@ -219,7 +219,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/setting
Preference secureDnsPref = findPreference(PREF_SECURE_DNS);
secureDnsPref.setVisible(SecureDnsSettings.isUiEnabled());
@@ -249,32 +229,6 @@ public class PrivacySettings
@@ -251,32 +231,6 @@ public class PrivacySettings extends PreferenceFragmentCompat
secureDnsPref.setSummary(SecureDnsSettings.getSummary(getContext()));
}
@@ -308,7 +308,7 @@ diff --git a/chrome/app/android/chrome_main_delegate_android.cc b/chrome/app/and
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -299,8 +299,6 @@ static_library("browser") {
@@ -297,8 +297,6 @@ static_library("browser") {
"commerce/shopping_service_factory.h",
"complex_tasks/task_tab_helper.cc",
"complex_tasks/task_tab_helper.h",
@@ -317,7 +317,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"component_updater/chrome_component_updater_configurator.cc",
"component_updater/chrome_component_updater_configurator.h",
"component_updater/chrome_origin_trials_component_installer.cc",
@@ -313,8 +311,6 @@ static_library("browser") {
@@ -311,8 +309,6 @@ static_library("browser") {
"component_updater/component_updater_utils.h",
"component_updater/crl_set_component_installer.cc",
"component_updater/crl_set_component_installer.h",
@@ -326,7 +326,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"component_updater/desktop_sharing_hub_component_remover.cc",
"component_updater/desktop_sharing_hub_component_remover.h",
"component_updater/first_party_sets_component_installer.cc",
@@ -665,11 +661,6 @@ static_library("browser") {
@@ -663,11 +659,6 @@ static_library("browser") {
"lookalikes/lookalike_url_service.h",
"lookalikes/lookalike_url_tab_storage.cc",
"lookalikes/lookalike_url_tab_storage.h",
@@ -338,7 +338,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"media/audio_service_util.cc",
"media/audio_service_util.h",
"media/history/media_history_contents_observer.cc",
@@ -1102,8 +1093,6 @@ static_library("browser") {
@@ -1100,8 +1091,6 @@ static_library("browser") {
"permissions/adaptive_quiet_notification_permission_ui_enabler.h",
"permissions/chrome_permissions_client.cc",
"permissions/chrome_permissions_client.h",
@@ -347,7 +347,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"permissions/crowd_deny_preload_data.cc",
"permissions/crowd_deny_preload_data.h",
"permissions/crowd_deny_safe_browsing_request.cc",
@@ -2172,9 +2161,6 @@ static_library("browser") {
@@ -2127,9 +2116,6 @@ static_library("browser") {
"//components/leveldb_proto",
"//components/live_caption:constants",
"//components/live_caption:utils",
@@ -357,7 +357,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/memory_pressure",
"//components/metrics:call_stack_profile_collector",
"//components/metrics:call_stack_profile_params",
@@ -2269,7 +2255,6 @@ static_library("browser") {
@@ -2225,7 +2211,6 @@ static_library("browser") {
"//components/reporting/util:task_runner_context",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -365,7 +365,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
@@ -3073,12 +3058,6 @@ static_library("browser") {
@@ -3028,12 +3013,6 @@ static_library("browser") {
"lifetime/application_lifetime_android.h",
"long_screenshots/long_screenshots_tab_service_factory.cc",
"long_screenshots/long_screenshots_tab_service_factory.h",
@@ -378,7 +378,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"media/android/cdm/media_drm_origin_id_manager.cc",
"media/android/cdm/media_drm_origin_id_manager.h",
"media/android/cdm/media_drm_origin_id_manager_factory.cc",
@@ -3630,8 +3609,6 @@ static_library("browser") {
@@ -3595,8 +3574,6 @@ static_library("browser") {
"download/download_commands.h",
"download/download_crx_util.cc",
"download/download_crx_util.h",
@@ -387,7 +387,7 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
"download/download_dir_policy_handler.cc",
"download/download_dir_policy_handler.h",
"download/download_dir_util.cc",
@@ -7943,9 +7920,6 @@ static_library("test_support") {
@@ -7932,9 +7909,6 @@ static_library("test_support") {
"//components/consent_auditor:test_support",
"//components/invalidation/impl",
"//components/invalidation/impl:test_support",
@@ -410,7 +410,7 @@ diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrom
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/ui/android/tab_model/tab_model_list.h"
#include "chrome/browser/ui/autofill/chrome_autofill_client.h"
@@ -60,7 +62,9 @@
@@ -61,7 +63,9 @@
#include "components/navigation_interception/intercept_navigation_delegate.h"
#include "components/no_state_prefetch/browser/no_state_prefetch_manager.h"
#include "components/paint_preview/buildflags/buildflags.h"
@@ -420,7 +420,7 @@ diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrom
#include "content/public/browser/file_select_listener.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/render_frame_host.h"
@@ -145,8 +149,10 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
@@ -146,8 +150,10 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
content::WebContents* portal_contents) {
WebContentsDelegateAndroid::PortalWebContentsCreated(portal_contents);
@@ -431,7 +431,7 @@ diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrom
// This is a subset of the tab helpers that would be attached by
// TabAndroid::AttachTabHelpers.
@@ -169,11 +175,13 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
@@ -163,11 +169,13 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
HistoryTabHelper::CreateForWebContents(portal_contents);
infobars::ContentInfoBarManager::CreateForWebContents(portal_contents);
PrefsTabHelper::CreateForWebContents(portal_contents);
@@ -459,7 +459,7 @@ diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
namespace subresource_filter {
class RulesetService;
}
@@ -211,9 +207,6 @@ class BrowserProcess {
@@ -218,9 +214,6 @@ class BrowserProcess {
// on this platform (or this is a unit test).
virtual StatusTray* status_tray() = 0;
@@ -480,7 +480,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
#include "chrome/browser/shell_integration.h"
#include "chrome/browser/site_isolation/prefs_observer.h"
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
@@ -111,7 +110,6 @@
@@ -110,7 +109,6 @@
#include "components/prefs/json_pref_store.h"
#include "components/prefs/pref_registry_simple.h"
#include "components/prefs/pref_service.h"
@@ -488,7 +488,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
#include "components/sessions/core/session_id_generator.h"
#include "components/subresource_filter/content/browser/ruleset_service.h"
#include "components/translate/core/browser/translate_download_manager.h"
@@ -418,8 +416,6 @@ void BrowserProcessImpl::StartTearDown() {
@@ -447,8 +445,6 @@ void BrowserProcessImpl::StartTearDown() {
metrics_services_manager_.reset();
intranet_redirect_detector_.reset();
@@ -497,7 +497,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
network_time_tracker_.reset();
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -1062,14 +1058,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
@@ -1094,14 +1090,6 @@ StatusTray* BrowserProcessImpl::status_tray() {
return status_tray_.get();
}
@@ -512,7 +512,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
subresource_filter::RulesetService*
BrowserProcessImpl::subresource_filter_ruleset_service() {
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
@@ -1309,23 +1297,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
@@ -1334,23 +1322,6 @@ void BrowserProcessImpl::CreateBackgroundPrintingManager() {
}
void BrowserProcessImpl::CreateSafeBrowsingService() {
@@ -539,7 +539,7 @@ diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_pro
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -180,7 +180,6 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -182,7 +182,6 @@ class BrowserProcessImpl : public BrowserProcess,
std::unique_ptr<BackgroundModeManager> manager) override;
#endif
StatusTray* status_tray() override;
@@ -547,7 +547,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
subresource_filter::RulesetService* subresource_filter_ruleset_service()
override;
@@ -331,9 +330,6 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -333,9 +332,6 @@ class BrowserProcessImpl : public BrowserProcess,
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
#endif
@@ -560,7 +560,7 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_proc
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
@@ -634,10 +634,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
@@ -625,10 +625,12 @@ void ChromeBrowsingDataRemoverDelegate::RemoveEmbedderData(
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
network::mojom::NetworkContext* safe_browsing_context = nullptr;
@@ -576,15 +576,15 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -121,6 +121,7 @@
@@ -119,6 +119,7 @@
#include "chrome/browser/profiling_host/chrome_browser_main_extra_parts_profiling.h"
#include "chrome/browser/renderer_host/chrome_navigation_ui_data.h"
#include "chrome/browser/renderer_preferences_util.h"
+#if defined(FULL_SAFE_BROWSING)
#include "chrome/browser/safe_browsing/certificate_reporting_service.h"
#include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
#include "chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_utils.h"
@@ -128,6 +129,7 @@
#include "chrome/browser/safe_browsing/chrome_ping_manager_factory.h"
@@ -127,6 +128,7 @@
#include "chrome/browser/safe_browsing/safe_browsing_service.h"
#include "chrome/browser/safe_browsing/url_checker_delegate_impl.h"
#include "chrome/browser/safe_browsing/url_lookup_service_factory.h"
@@ -592,7 +592,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#include "chrome/browser/search/search.h"
#include "chrome/browser/segmentation_platform/chrome_browser_main_extra_parts_segmentation_platform.h"
#include "chrome/browser/sharing/sms/sms_remote_fetcher.h"
@@ -1065,9 +1067,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
@@ -1047,9 +1049,7 @@ void SetApplicationLocaleOnIOThread(const std::string& locale) {
class CertificateReportingServiceCertReporter : public SSLCertReporter {
public:
explicit CertificateReportingServiceCertReporter(
@@ -603,7 +603,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
CertificateReportingServiceCertReporter(
const CertificateReportingServiceCertReporter&) = delete;
@@ -1079,11 +1079,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter {
@@ -1061,11 +1061,9 @@ class CertificateReportingServiceCertReporter : public SSLCertReporter {
// SSLCertReporter implementation
void ReportInvalidCertificateChain(
const std::string& serialized_report) override {
@@ -615,7 +615,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
};
#if BUILDFLAG(ENABLE_EXTENSIONS)
@@ -2575,7 +2573,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
@@ -2581,7 +2579,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
}
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
@@ -624,7 +624,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
@@ -5027,6 +5025,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ -5056,6 +5054,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
&throttles);
#endif
@@ -632,7 +632,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
// g_browser_process->safe_browsing_service() may be null in unittests.
safe_browsing::SafeBrowsingUIManager* ui_manager =
g_browser_process->safe_browsing_service()
@@ -5042,6 +5041,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
@@ -5071,6 +5070,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigation(
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
handle));
}
@@ -640,7 +640,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
@@ -5312,7 +5312,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState(
@@ -5349,7 +5349,9 @@ void ChromeContentBrowserClient::OverridePageVisibilityState(
void ChromeContentBrowserClient::InitOnUIThread() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -650,15 +650,15 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
// Initialize `network_contexts_parent_directory_`.
base::FilePath user_data_dir;
@@ -6585,6 +6587,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
const std::vector<std::string>& allowlist_domains) {
DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -6615,6 +6617,7 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
? content::BrowserThread::UI
: content::BrowserThread::IO);
+#if defined(FULL_SAFE_BROWSING)
// Should not bypass safe browsing check if the check is for enterprise
// lookup.
if (!safe_browsing_enabled_for_profile && !should_check_on_sb_disabled)
@@ -6605,6 +6608,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
@@ -6635,6 +6638,9 @@ ChromeContentBrowserClient::GetSafeBrowsingUrlCheckerDelegate(
}
return safe_browsing_url_checker_delegate_;
@@ -668,7 +668,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
}
safe_browsing::RealTimeUrlLookupServiceBase*
@@ -6612,24 +6618,28 @@ ChromeContentBrowserClient::GetUrlLookupService(
@@ -6642,24 +6648,28 @@ ChromeContentBrowserClient::GetUrlLookupService(
content::BrowserContext* browser_context,
bool is_enterprise_lookup_enabled,
bool is_consumer_lookup_enabled) {
@@ -701,7 +701,7 @@ diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/ch
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -941,9 +941,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -964,9 +964,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
// Parts are deleted in the reverse order they are added.
std::vector<ChromeContentBrowserClientParts*> extra_parts_;
@@ -758,7 +758,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c
#include "chrome/browser/component_updater/chrome_origin_trials_component_installer.h"
#include "chrome/browser/component_updater/commerce_heuristics_component_installer.h"
#include "chrome/browser/component_updater/crl_set_component_installer.h"
@@ -39,7 +38,6 @@
@@ -40,7 +39,6 @@
#include "components/component_updater/installer_policies/autofill_states_component_installer.h"
#include "components/component_updater/installer_policies/on_device_head_suggest_component_installer.h"
#include "components/component_updater/installer_policies/optimization_hints_component_installer.h"
@@ -766,7 +766,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c
#include "components/component_updater/url_param_filter_remover.h"
#include "components/nacl/common/buildflags.h"
#include "components/safe_browsing/core/common/features.h"
@@ -185,9 +183,6 @@ void RegisterComponentsForUpdate() {
@@ -186,9 +184,6 @@ void RegisterComponentsForUpdate() {
MaybeRegisterPKIMetadataComponent(cus);
@@ -776,7 +776,7 @@ diff --git a/chrome/browser/component_updater/registration.cc b/chrome/browser/c
#if BUILDFLAG(IS_CHROMEOS_ASH)
RegisterSmartDimComponent(cus);
RegisterAppProvisioningComponent(cus);
@@ -208,13 +203,6 @@ void RegisterComponentsForUpdate() {
@@ -214,13 +209,6 @@ void RegisterComponentsForUpdate() {
RegisterAutofillStatesComponent(cus, g_browser_process->local_state());
@@ -812,8 +812,8 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
+#endif
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/net/safe_search_util.h"
@@ -68,9 +72,11 @@
#include "chrome/common/pdf_util.h"
@@ -68,10 +72,12 @@
#include "components/prefs/pref_member.h"
#include "components/prefs/pref_service.h"
#include "components/safe_browsing/buildflags.h"
@@ -821,11 +821,12 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#include "components/safe_browsing/content/browser/download/download_stats.h"
#include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h"
#include "components/safe_browsing/content/common/file_type_policies.h"
#include "components/safe_search_api/safe_search_util.h"
+#endif
#include "components/services/quarantine/public/mojom/quarantine.mojom.h"
#include "components/services/quarantine/quarantine_impl.h"
#include "content/public/browser/browser_task_traits.h"
@@ -136,7 +142,9 @@ using content::DownloadManager;
@@ -137,7 +143,9 @@ using content::DownloadManager;
using download::DownloadItem;
using download::DownloadPathReservationTracker;
using download::PathValidationResult;
@@ -849,7 +850,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (download_restriction !=
DownloadPrefs::DownloadRestriction::POTENTIALLY_DANGEROUS_FILES &&
download_restriction !=
@@ -402,8 +410,8 @@ void MaybeReportDangerousDownloadBlocked(
@@ -405,8 +413,8 @@ void MaybeReportDangerousDownloadBlocked(
danger_type, download->GetMimeType(), /*scan_id*/ "",
download->GetTotalBytes(), safe_browsing::EventResult::BLOCKED);
}
@@ -859,7 +860,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#if BUILDFLAG(FULL_SAFE_BROWSING)
download::DownloadDangerType SavePackageDangerType(
@@ -461,13 +469,6 @@ void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
@@ -464,13 +472,6 @@ void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) {
download_manager_ = dm;
@@ -873,7 +874,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (download_manager_) {
download_manager_->AddObserver(this);
}
@@ -832,17 +833,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
@@ -835,17 +836,6 @@ void ChromeDownloadManagerDelegate::ChooseSavePath(
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
base::FilePath* filename,
const GURL& source_url) {
@@ -891,7 +892,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
}
void ChromeDownloadManagerDelegate::SanitizeDownloadParameters(
@@ -906,9 +896,6 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
@@ -910,9 +900,6 @@ void ChromeDownloadManagerDelegate::OpenDownload(DownloadItem* download) {
chrome::ShowSettingsSubPage(browser, "certificates");
else
browser->OpenURL(params);
@@ -901,7 +902,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
#endif // BUILDFLAG(IS_ANDROID)
}
@@ -962,12 +949,6 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
@@ -966,12 +953,6 @@ ChromeDownloadManagerDelegate::ApplicationClientIdForFileScanning() {
DownloadProtectionService*
ChromeDownloadManagerDelegate::GetDownloadProtectionService() {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -914,7 +915,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
return nullptr;
}
#endif
@@ -1514,8 +1495,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
@@ -1518,8 +1499,11 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
DownloadItemModel model(item);
model.DetermineAndSetShouldPreferOpeningInBrowser(
target_info->target_path, target_info->is_filetype_handled_safely);
@@ -926,7 +927,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (ShouldBlockFile(item, target_info->danger_type)) {
MaybeReportDangerousDownloadBlocked(
download_prefs_->download_restriction(), "DANGEROUS_FILE_TYPE",
@@ -1524,6 +1508,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
@@ -1528,6 +1512,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDetermined(
// A dangerous type would take precedence over the blocking of the file.
target_info->danger_type = download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS;
}
@@ -934,15 +935,15 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
base::FilePath target_path = target_info->target_path;
@@ -1593,6 +1578,7 @@ bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
bool ChromeDownloadManagerDelegate::ShouldBlockFile(
download::DownloadItem* item,
download::DownloadDangerType danger_type) const {
@@ -1602,6 +1587,7 @@ bool ChromeDownloadManagerDelegate::ShouldBlockFile(
return false;
}
+#if BUILDFLAG(FULL_SAFE_BROWSING)
DownloadPrefs::DownloadRestriction download_restriction =
download_prefs_->download_restriction();
@@ -1641,7 +1627,7 @@ bool ChromeDownloadManagerDelegate::ShouldBlockFile(
@@ -1650,7 +1636,7 @@ bool ChromeDownloadManagerDelegate::ShouldBlockFile(
LOG(ERROR) << "Invalid download restruction value: "
<< static_cast<int>(download_restriction);
}
@@ -951,7 +952,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
return false;
}
@@ -1655,7 +1641,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
@@ -1664,7 +1650,6 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
service->MaybeSendDangerousDownloadOpenedReport(download,
show_download_in_folder);
}
@@ -959,7 +960,7 @@ diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrom
if (!download->GetAutoOpened()) {
download::DownloadContent download_content =
download::DownloadContentFromMimeType(download->GetMimeType(), false);
@@ -1663,6 +1648,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
@@ -1672,6 +1657,7 @@ void ChromeDownloadManagerDelegate::MaybeSendDangerousDownloadOpenedReport(
download->GetDangerType(), download_content, base::Time::Now(),
download->GetEndTime(), show_download_in_folder);
}
@@ -1003,7 +1004,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
#include "components/safe_browsing/core/common/features.h"
#include "components/signin/public/base/consent_level.h"
#include "components/signin/public/identity_manager/account_info.h"
@@ -70,7 +74,9 @@
@@ -71,7 +75,9 @@
using download::DownloadItem;
using InsecureDownloadStatus = download::DownloadItem::InsecureDownloadStatus;
@@ -1013,7 +1014,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
using ReportThreatDetailsResult =
safe_browsing::PingManager::ReportThreatDetailsResult;
using TailoredVerdict = safe_browsing::ClientDownloadResponse::TailoredVerdict;
@@ -108,9 +114,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data {
@@ -109,9 +115,11 @@ class DownloadItemModelData : public base::SupportsUserData::Data {
// for the file type.
absl::optional<bool> should_prefer_opening_in_browser_;
@@ -1025,7 +1026,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
// Whether the download is currently being revived.
bool is_being_revived_;
@@ -160,7 +168,9 @@ DownloadItemModelData* DownloadItemModelData::GetOrCreate(
@@ -161,7 +169,9 @@ DownloadItemModelData* DownloadItemModelData::GetOrCreate(
DownloadItemModelData::DownloadItemModelData()
: should_show_in_shelf_(true),
was_ui_notified_(false),
@@ -1035,7 +1036,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
is_being_revived_(false) {}
#if BUILDFLAG(FULL_SAFE_BROWSING)
@@ -543,6 +553,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
@@ -544,6 +554,7 @@ void DownloadItemModel::SetShouldPreferOpeningInBrowser(bool preference) {
data->should_prefer_opening_in_browser_ = preference;
}
@@ -1043,7 +1044,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const {
const DownloadItemModelData* data = DownloadItemModelData::Get(download_);
return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS;
@@ -553,6 +564,7 @@ void DownloadItemModel::SetDangerLevel(
@@ -554,6 +565,7 @@ void DownloadItemModel::SetDangerLevel(
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
data->danger_level_ = danger_level;
}
@@ -1051,7 +1052,7 @@ diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/dow
download::DownloadItem::InsecureDownloadStatus
DownloadItemModel::GetInsecureDownloadStatus() const {
@@ -728,9 +740,6 @@ bool DownloadItemModel::IsCommandEnabled(
@@ -729,9 +741,6 @@ bool DownloadItemModel::IsCommandEnabled(
// filename. Don't base an "Always open" decision based on it. Also
// exclude extensions.
return download_->CanOpenDownload() &&
@@ -1147,9 +1148,9 @@ diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download
#include "components/safe_browsing/content/browser/download/download_stats.h"
+#endif
void RecordDownloadCount(ChromeDownloadCountTypes type) {
base::UmaHistogramEnumeration("Download.CountsChrome", type,
@@ -29,8 +31,10 @@ void RecordDangerousDownloadWarningShown(
void RecordDownloadSource(ChromeDownloadSource source) {
base::UmaHistogramEnumeration("Download.SourcesChrome", source,
@@ -24,8 +26,10 @@ void RecordDangerousDownloadWarningShown(
bool has_user_gesture) {
base::UmaHistogramEnumeration("Download.ShowedDownloadWarning", danger_type,
download::DOWNLOAD_DANGER_TYPE_MAX);
@@ -1159,8 +1160,8 @@ diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download
+#endif
}
void RecordOpenedDangerousConfirmDialog(
@@ -45,6 +49,7 @@ void RecordDownloadOpen(ChromeDownloadOpenMethod open_method,
void RecordDownloadOpen(ChromeDownloadOpenMethod open_method,
@@ -33,11 +37,13 @@ void RecordDownloadOpen(ChromeDownloadOpenMethod open_method,
base::RecordAction(base::UserMetricsAction("Download.Open"));
base::UmaHistogramEnumeration("Download.OpenMethod", open_method,
DOWNLOAD_OPEN_METHOD_LAST_ENTRY);
@@ -1168,8 +1169,6 @@ diff --git a/chrome/browser/download/download_stats.cc b/chrome/browser/download
download::DownloadContent download_content =
download::DownloadContentFromMimeType(
mime_type_string, /*record_content_subcategory=*/false);
@@ -61,6 +66,7 @@ void RecordDownloadOpen(ChromeDownloadOpenMethod open_method,
}
base::UmaHistogramEnumeration("Download.Open.ContentType", download_content,
download::DownloadContent::MAX);
+#endif
@@ -1449,7 +1448,7 @@ diff --git a/chrome/browser/download/download_target_info.h b/chrome/browser/dow
diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/download/download_ui_model.cc
--- a/chrome/browser/download/download_ui_model.cc
+++ b/chrome/browser/download/download_ui_model.cc
@@ -40,7 +40,9 @@
@@ -41,7 +41,9 @@
using download::DownloadItem;
using offline_items_collection::FailState;
@@ -1459,7 +1458,7 @@ diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/downl
namespace {
@@ -471,12 +473,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() {
@@ -472,12 +474,14 @@ bool DownloadUIModel::ShouldPreferOpeningInBrowser() {
void DownloadUIModel::SetShouldPreferOpeningInBrowser(bool preference) {}
@@ -1477,17 +1476,18 @@ diff --git a/chrome/browser/download/download_ui_model.cc b/chrome/browser/downl
diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/download/download_ui_model.h
--- a/chrome/browser/download/download_ui_model.h
+++ b/chrome/browser/download/download_ui_model.h
@@ -18,7 +18,9 @@
@@ -18,8 +18,10 @@
#include "components/download/public/common/download_item.h"
#include "components/offline_items_collection/core/offline_item.h"
#include "components/safe_browsing/buildflags.h"
+#if defined(FULL_SAFE_BROWSING)
#include "components/safe_browsing/content/common/proto/download_file_types.pb.h"
#include "third_party/abseil-cpp/absl/types/optional.h"
+#endif
#include "ui/base/models/image_model.h"
#include "ui/color/color_id.h"
#include "ui/gfx/vector_icon_types.h"
@@ -355,6 +357,7 @@ class DownloadUIModel {
@@ -362,6 +364,7 @@ class DownloadUIModel {
// Change what's returned by ShouldPreferOpeningInBrowser to |preference|.
virtual void SetShouldPreferOpeningInBrowser(bool preference);
@@ -1495,7 +1495,7 @@ diff --git a/chrome/browser/download/download_ui_model.h b/chrome/browser/downlo
// Return the danger level determined during download target determination.
// The value returned here is independent of the danger level as determined by
// the Safe Browsing.
@@ -363,6 +366,7 @@ class DownloadUIModel {
@@ -370,6 +373,7 @@ class DownloadUIModel {
// Change what's returned by GetDangerLevel().
virtual void SetDangerLevel(
safe_browsing::DownloadFileType::DangerLevel danger_level);
@@ -1507,7 +1507,7 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b
--- a/chrome/browser/extensions/api/downloads/downloads_api.cc
+++ b/chrome/browser/extensions/api/downloads/downloads_api.cc
@@ -37,7 +37,6 @@
#include "chrome/browser/download/bubble/download_bubble_prefs.h"
#include "chrome/browser/download/bubble/download_bubble_ui_controller.h"
#include "chrome/browser/download/download_core_service.h"
#include "chrome/browser/download/download_core_service_factory.h"
-#include "chrome/browser/download/download_danger_prompt.h"
@@ -1522,8 +1522,8 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.cc b/chrome/b
- DownloadsAcceptDangerFunction::on_prompt_created_ = nullptr;
-
ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() {
std::unique_ptr<downloads::AcceptDanger::Params> params(
downloads::AcceptDanger::Params::Create(args()));
absl::optional<downloads::AcceptDanger::Params> params =
downloads::AcceptDanger::Params::Create(args());
@@ -1401,42 +1397,7 @@ void DownloadsAcceptDangerFunction::PromptOrWait(int download_id, int retries) {
return;
}
@@ -1610,8 +1610,8 @@ diff --git a/chrome/browser/extensions/api/downloads/downloads_api.h b/chrome/br
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
@@ -1280,21 +1280,9 @@ WebstorePrivateGetExtensionStatusFunction::Run() {
GetExtensionStatus::Params::Create(args()));
@@ -1288,21 +1288,9 @@ WebstorePrivateGetExtensionStatusFunction::Run() {
GetExtensionStatus::Params::Create(args());
EXTENSION_FUNCTION_VALIDATE(params);
- const ExtensionId& extension_id = params->id;
@@ -1776,7 +1776,7 @@ diff --git a/chrome/browser/lookalikes/lookalike_url_controller_client.cc b/chro
diff --git a/chrome/browser/metrics/chrome_metrics_service_client.cc b/chrome/browser/metrics/chrome_metrics_service_client.cc
--- a/chrome/browser/metrics/chrome_metrics_service_client.cc
+++ b/chrome/browser/metrics/chrome_metrics_service_client.cc
@@ -908,7 +908,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
@@ -949,7 +949,6 @@ void ChromeMetricsServiceClient::RegisterMetricsServiceProviders() {
metrics_service_->RegisterMetricsProvider(
std::make_unique<CertificateReportingMetricsProvider>());
#endif
@@ -1812,7 +1812,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
#endif
#if BUILDFLAG(IS_ANDROID)
@@ -888,21 +888,13 @@ autofill::LanguageCode ChromePasswordManagerClient::GetPageLanguage() const {
@@ -883,21 +883,13 @@ autofill::LanguageCode ChromePasswordManagerClient::GetPageLanguage() const {
safe_browsing::PasswordProtectionService*
ChromePasswordManagerClient::GetPasswordProtectionService() const {
@@ -1835,7 +1835,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
}
#endif // defined(ON_FOCUS_PING_ENABLED)
@@ -914,15 +906,6 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
@@ -909,15 +901,6 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
bool password_field_exists,
uint64_t reused_password_hash,
const std::string& domain) {
@@ -1851,7 +1851,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
#if !BUILDFLAG(IS_ANDROID)
// If the webpage is not an extension page, do nothing.
if (!GURL(domain).SchemeIs(kExtensionScheme)) {
@@ -961,11 +944,6 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
@@ -956,11 +939,6 @@ void ChromePasswordManagerClient::CheckProtectedPasswordEntry(
}
void ChromePasswordManagerClient::LogPasswordReuseDetectedEvent() {
@@ -1863,7 +1863,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
}
#if !BUILDFLAG(IS_ANDROID)
@@ -1578,6 +1556,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage(
@@ -1582,6 +1560,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage(
is_enabled = false;
}
@@ -1871,7 +1871,7 @@ diff --git a/chrome/browser/password_manager/chrome_password_manager_client.cc b
// SafeBrowsing Delayed Warnings experiment can delay some SafeBrowsing
// warnings until user interaction. If the current page has a delayed warning,
// it'll have a user interaction observer attached. Disable password
@@ -1588,6 +1567,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage(
@@ -1592,6 +1571,7 @@ bool ChromePasswordManagerClient::IsPasswordManagementEnabledForCurrentPage(
observer->OnPasswordSaveOrAutofillDenied();
is_enabled = false;
}
@@ -1974,7 +1974,7 @@ diff --git a/chrome/browser/permissions/quiet_notification_permission_ui_config.
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
@@ -9,6 +9,7 @@
@@ -10,6 +10,7 @@
#include "base/trace_event/trace_event.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
@@ -1982,7 +1982,7 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browse
#include "build/chromecast_buildflags.h"
#include "build/chromeos_buildflags.h"
#include "chrome/browser/about_flags.h"
@@ -1371,7 +1372,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1430,7 +1431,9 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
PushMessagingAppIdentifier::RegisterProfilePrefs(registry);
QuietNotificationPermissionUiState::RegisterProfilePrefs(registry);
RegisterBrowserUserPrefs(registry);
@@ -2081,15 +2081,15 @@ diff --git a/chrome/browser/privacy_guide/android/java/src/org/chromium/chrome/b
diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
@@ -122,7 +122,6 @@
@@ -125,7 +125,6 @@
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/reading_list/reading_list_model_factory.h"
#include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
-#include "chrome/browser/safe_browsing/certificate_reporting_service_factory.h"
#include "chrome/browser/safe_browsing/chrome_password_protection_service_factory.h"
#include "chrome/browser/safe_browsing/chrome_ping_manager_factory.h"
#include "chrome/browser/safe_browsing/client_side_detection_service_factory.h"
#include "chrome/browser/safe_browsing/safe_browsing_metrics_collector_factory.h"
@@ -520,7 +519,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -563,7 +562,6 @@ void ChromeBrowserMainExtraPartsProfiles::
CertDbInitializerFactory::GetInstance();
#endif
#if BUILDFLAG(SAFE_BROWSING_AVAILABLE)
@@ -2097,20 +2097,21 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
#endif
#if BUILDFLAG(ENABLE_SUPERVISED_USERS)
ChildAccountServiceFactory::GetInstance();
@@ -830,12 +828,6 @@ void ChromeBrowserMainExtraPartsProfiles::
@@ -897,13 +895,6 @@ void ChromeBrowserMainExtraPartsProfiles::
safe_browsing::ExtensionTelemetryServiceFactory::GetInstance();
safe_browsing::HashRealTimeServiceFactory::GetInstance();
#endif
- safe_browsing::ChromePasswordProtectionServiceFactory::GetInstance();
- safe_browsing::ChromePingManagerFactory::GetInstance();
- safe_browsing::ClientSideDetectionServiceFactory::GetInstance();
- safe_browsing::RealTimeUrlLookupServiceFactory::GetInstance();
- safe_browsing::SafeBrowsingMetricsCollectorFactory::GetInstance();
- safe_browsing::SafeBrowsingNavigationObserverManagerFactory::GetInstance();
- safe_browsing::VerdictCacheManagerFactory::GetInstance();
#if BUILDFLAG(IS_MAC)
if (screentime::IsScreenTimeEnabled()) {
screentime::HistoryBridgeFactory::GetInstance();
@@ -884,7 +876,9 @@ void ChromeBrowserMainExtraPartsProfiles::
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
screen_ai::AXScreenAIAnnotatorFactory::EnsureFactoryBuilt();
screen_ai::PdfOcrControllerFactory::GetInstance();
@@ -957,7 +948,9 @@ void ChromeBrowserMainExtraPartsProfiles::
}
#endif
TabRestoreServiceFactory::GetInstance();
@@ -2123,7 +2124,7 @@ diff --git a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -94,7 +94,6 @@
@@ -93,7 +93,6 @@
#include "chrome/browser/push_messaging/push_messaging_service_factory.h"
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
#include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
@@ -2378,7 +2379,7 @@ diff --git a/chrome/browser/safe_browsing/android/safe_browsing_bridge.cc b/chro
diff --git a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
--- a/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
+++ b/chrome/browser/safe_browsing/download_protection/download_protection_service.cc
@@ -807,11 +807,13 @@ void DownloadProtectionService::RequestFinished(DeepScanningRequest* request) {
@@ -811,11 +811,13 @@ void DownloadProtectionService::RequestFinished(DeepScanningRequest* request) {
deep_scanning_requests_.erase(it);
}
@@ -2420,7 +2421,7 @@ diff --git a/chrome/browser/safe_browsing/download_protection/download_protectio
diff --git a/chrome/browser/safe_browsing/url_lookup_service_factory.cc b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
--- a/chrome/browser/safe_browsing/url_lookup_service_factory.cc
+++ b/chrome/browser/safe_browsing/url_lookup_service_factory.cc
@@ -56,6 +56,7 @@ RealTimeUrlLookupServiceFactory::RealTimeUrlLookupServiceFactory()
@@ -63,6 +63,7 @@ RealTimeUrlLookupServiceFactory::RealTimeUrlLookupServiceFactory()
KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
@@ -2428,7 +2429,7 @@ diff --git a/chrome/browser/safe_browsing/url_lookup_service_factory.cc b/chrome
if (!g_browser_process->safe_browsing_service()) {
return nullptr;
}
@@ -78,6 +79,9 @@ KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor(
@@ -85,6 +86,9 @@ KeyedService* RealTimeUrlLookupServiceFactory::BuildServiceInstanceFor(
profile->IsOffTheRecord(), g_browser_process->variations_service(),
SafeBrowsingNavigationObserverManagerFactory::GetForBrowserContext(
profile));
@@ -2670,7 +2671,7 @@ diff --git a/chrome/browser/subresource_filter/chrome_content_subresource_filter
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
@@ -558,7 +558,6 @@ static_library("ui") {
@@ -560,7 +560,6 @@ static_library("ui") {
"//components/renderer_context_menu",
"//components/resources",
"//components/safe_browsing/content/browser",
@@ -2678,7 +2679,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/web_ui",
"//components/safe_browsing/core/browser/db:database_manager",
@@ -4540,7 +4539,6 @@ static_library("ui") {
@@ -4592,7 +4591,6 @@ static_library("ui") {
"views/download/bubble/download_dialog_view.h",
"views/download/bubble/download_toolbar_button_view.cc",
"views/download/bubble/download_toolbar_button_view.h",
@@ -2689,7 +2690,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -411,9 +411,6 @@ CHAR_LIMIT guidelines:
@@ -414,9 +414,6 @@ CHAR_LIMIT guidelines:
<message name="IDS_USAGE_AND_CRASH_REPORTS_TITLE" desc="Title for a preference that enables sending usage statistics and crash reports.">
Help improve Chrome\u2019s features and performance
</message>
@@ -2699,8 +2700,8 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
<!-- Metrics settings -->
<message name="IDS_PREFS_METRICS_SETTINGS" desc="Title for the page that allows the user to control how much usage data Chrome uploads. [CHAR_LIMIT=32]">
@@ -4942,9 +4939,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
Helps you complete tasks, such as checkout, throughout the web
@@ -4945,9 +4942,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
Resume
</message>
<!-- Usage Stats strings -->
- <message name="IDS_USAGE_STATS_CONSENT_TITLE" desc="Title for activity authorizing Digital Wellbeing to access Chrome usage data">
@@ -2720,7 +2721,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "chrome/browser/media/history/media_history_contents_observer.h"
#include "chrome/browser/media/media_engagement_service.h"
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_observer.h"
@@ -62,12 +61,14 @@
@@ -61,12 +60,14 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_key.h"
#include "chrome/browser/resource_coordinator/tab_helper.h"
@@ -2735,7 +2736,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "chrome/browser/search_engines/template_url_service_factory.h"
#include "chrome/browser/sessions/session_tab_helper_factory.h"
#include "chrome/browser/ssl/chrome_security_blocking_page_factory.h"
@@ -132,9 +133,11 @@
@@ -131,9 +132,11 @@
#include "components/permissions/permission_recovery_success_rate_tracker.h"
#include "components/permissions/permission_request_manager.h"
#include "components/permissions/unused_site_permissions_service.h"
@@ -2747,7 +2748,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#include "components/search/ntp_features.h"
#include "components/site_engagement/content/site_engagement_helper.h"
#include "components/site_engagement/content/site_engagement_service.h"
@@ -405,6 +408,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -398,6 +401,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
// See https://crbug.com/910288.
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
web_contents);
@@ -2755,7 +2756,7 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents(
web_contents, HostContentSettingsMapFactory::GetForProfile(profile),
safe_browsing::SafeBrowsingNavigationObserverManagerFactory::
@@ -422,6 +426,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
@@ -415,6 +419,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents(
profile, web_contents);
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
@@ -2766,15 +2767,15 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
@@ -278,6 +278,7 @@ CreateHttpsOnlyModePage(content::WebContents* web_contents) {
request_url));
@@ -279,6 +279,7 @@ CreateHttpsOnlyModePage(content::WebContents* web_contents) {
/*is_under_advanced_protection=*/false);
}
+#if 0
std::unique_ptr<safe_browsing::SafeBrowsingBlockingPage>
CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) {
safe_browsing::SBThreatType threat_type =
@@ -336,7 +337,9 @@ CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) {
@@ -337,7 +338,9 @@ CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) {
ui_manager->blocking_page_factory()->CreateSafeBrowsingPage(
ui_manager, web_contents, main_frame_url, {resource}, true));
}
@@ -2784,7 +2785,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
std::unique_ptr<EnterpriseBlockPage> CreateEnterpriseBlockPage(
content::WebContents* web_contents) {
const GURL kRequestUrl("https://enterprise-block.example.net");
@@ -427,6 +430,7 @@ CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) {
@@ -428,6 +431,7 @@ CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) {
g_browser_process->safe_browsing_service()->ui_manager().get(),
web_contents, main_frame_url, resource, is_giant_webview));
}
@@ -2792,7 +2793,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
#if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION)
std::unique_ptr<CaptivePortalBlockingPage> CreateCaptivePortalBlockingPage(
@@ -534,12 +538,6 @@ void InterstitialHTMLSource::StartDataRequest(
@@ -535,12 +539,6 @@ void InterstitialHTMLSource::StartDataRequest(
interstitial_delegate = CreateMITMSoftwareBlockingPage(web_contents);
} else if (path_without_query == "/blocked-interception") {
interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents);
@@ -2805,7 +2806,7 @@ diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/b
} else if (path_without_query == "/clock") {
interstitial_delegate = CreateBadClockBlockingPage(web_contents);
} else if (path_without_query == "/lookalike") {
@@ -552,13 +550,7 @@ void InterstitialHTMLSource::StartDataRequest(
@@ -553,13 +551,7 @@ void InterstitialHTMLSource::StartDataRequest(
interstitial_delegate = CreateInsecureFormPage(web_contents);
} else if (path_without_query == "/https_only") {
interstitial_delegate = CreateHttpsOnlyModePage(web_contents);
@@ -2838,15 +2839,7 @@ diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/
"//components/safe_browsing/core/common",
]
public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
@@ -69,7 +67,6 @@ if (safe_browsing_mode == 1) {
":download_type_util",
"//base",
"//base:i18n",
- "//components/safe_browsing/content/common:file_type_policies",
"//components/safe_browsing/core/common",
"//third_party/unrar:unrar",
]
@@ -151,10 +148,6 @@ if (safe_browsing_mode == 1) {
@@ -132,10 +130,6 @@ if (safe_browsing_mode == 1) {
source_set("safe_browsing") {
deps = []
@@ -2857,6 +2850,14 @@ diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/
if (safe_browsing_mode == 1) {
sources = [
"ipc_protobuf_message_macros.h",
@@ -157,7 +151,6 @@ source_set("safe_browsing") {
":download_type_util",
"//base",
"//base:i18n",
- "//components/safe_browsing/content/common:file_type_policies",
"//components/safe_browsing/core/common",
"//third_party/lzma_sdk/google:seven_zip_reader",
"//third_party/unrar:unrar",
diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn
--- a/chrome/renderer/BUILD.gn
+++ b/chrome/renderer/BUILD.gn
@@ -2885,7 +2886,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer
#include "components/spellcheck/spellcheck_buildflags.h"
#include "components/subresource_filter/content/renderer/subresource_filter_agent.h"
#include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h"
@@ -433,12 +435,8 @@ void ChromeContentRendererClient::RenderThreadStarted() {
@@ -459,12 +461,8 @@ void ChromeContentRendererClient::RenderThreadStarted() {
subresource_filter_ruleset_dealer_ =
std::make_unique<subresource_filter::UnverifiedRulesetDealer>();
@@ -2921,7 +2922,7 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1006,7 +1006,6 @@ if (is_android) {
@@ -1042,7 +1042,6 @@ if (is_android) {
"//components/password_manager/content/browser:browser",
"//components/policy:chrome_settings_proto_generated_compile",
"//components/policy/core/browser:test_support",
@@ -2929,7 +2930,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/safe_browsing/content/common:interfaces",
"//components/safe_browsing/content/renderer/phishing_classifier:phishing_classifier",
"//components/safe_browsing/core/common/fbs:client_model",
@@ -1322,8 +1321,6 @@ if (!is_android) {
@@ -1356,8 +1355,6 @@ if (!is_android) {
"//chrome/browser/profiling_host:profiling_browsertests",
"//chrome/browser/resource_coordinator:mojo_bindings",
"//chrome/browser/resource_coordinator:tab_manager_features",
@@ -2938,7 +2939,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//chrome/browser/segmentation_platform:test_utils",
"//chrome/browser/sharing/proto",
"//chrome/browser/storage_access_api:permissions",
@@ -1466,7 +1463,6 @@ if (!is_android) {
@@ -1501,7 +1498,6 @@ if (!is_android) {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -2946,7 +2947,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
"//components/safe_browsing/content/browser:safe_browsing_service",
"//components/safe_browsing/content/browser/password_protection",
"//components/safe_browsing/content/browser/password_protection:test_support",
@@ -6082,7 +6078,6 @@ test("unit_tests") {
@@ -6165,7 +6161,6 @@ test("unit_tests") {
"//components/resources",
"//components/safe_browsing:buildflags",
"//components/safe_browsing/content/browser",
@@ -2957,7 +2958,7 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
diff --git a/components/BUILD.gn b/components/BUILD.gn
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -655,7 +655,6 @@ test("components_unittests") {
@@ -661,7 +661,6 @@ test("components_unittests") {
if (safe_browsing_mode == 1) {
deps += [
"//components/safe_browsing/content/browser:unit_tests",
@@ -2980,7 +2981,7 @@ diff --git a/components/component_updater/installer_policies/BUILD.gn b/componen
diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc
--- a/components/permissions/permission_request_manager.cc
+++ b/components/permissions/permission_request_manager.cc
@@ -715,10 +715,7 @@ PermissionRequestManager::PermissionRequestManager(
@@ -727,10 +727,7 @@ PermissionRequestManager::PermissionRequestManager(
view_factory_(base::BindRepeating(&PermissionPrompt::Create)),
tab_is_hidden_(web_contents->GetVisibility() ==
content::Visibility::HIDDEN),
@@ -3019,7 +3020,7 @@ diff --git a/components/safe_browsing/content/common/file_type_policies.cc b/com
diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_browsing/core/common/features.cc
--- a/components/safe_browsing/core/common/features.cc
+++ b/components/safe_browsing/core/common/features.cc
@@ -224,8 +224,8 @@ constexpr base::FeatureParam<int> kStrictDownloadTimeoutMilliseconds{
@@ -227,8 +227,8 @@ constexpr base::FeatureParam<int> kStrictDownloadTimeoutMilliseconds{
/*default_value=*/7000};
BASE_FEATURE(kSuspiciousSiteTriggerQuotaFeature,
@@ -3028,8 +3029,8 @@ diff --git a/components/safe_browsing/core/common/features.cc b/components/safe_
+ "SafeBrowsingSuspiciousSiteTriggerQuota", // disabled by default
+ base::FEATURE_DISABLED_BY_DEFAULT); // in Bromite
BASE_FEATURE(kTailoredSecurityDesktopNotice,
"TailoredSecurityDesktopNotice",
BASE_FEATURE(kTailoredSecurityRetryForSyncUsers,
"TailoredSecurityRetryForSyncUsers",
diff --git a/components/security_interstitials/content/captive_portal_blocking_page.cc b/components/security_interstitials/content/captive_portal_blocking_page.cc
--- a/components/security_interstitials/content/captive_portal_blocking_page.cc
+++ b/components/security_interstitials/content/captive_portal_blocking_page.cc
@@ -3236,7 +3237,7 @@ diff --git a/content/public/browser/file_system_access_permission_context.h b/co
diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn
--- a/weblayer/BUILD.gn
+++ b/weblayer/BUILD.gn
@@ -470,11 +470,9 @@ source_set("weblayer_lib_base") {
@@ -462,11 +462,9 @@ source_set("weblayer_lib_base") {
"//components/profile_metrics",
"//components/reduce_accept_language/browser",
"//components/safe_browsing/content/browser",
@@ -3248,7 +3249,7 @@ diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn
"//components/safe_browsing/core/browser:safe_browsing_metrics_collector",
"//components/safe_browsing/core/browser/db:database_manager",
"//components/safe_browsing/core/common",
@@ -609,8 +607,6 @@ source_set("weblayer_lib_base") {
@@ -601,8 +599,6 @@ source_set("weblayer_lib_base") {
"browser/bluetooth/weblayer_bluetooth_scanning_prompt_android_delegate.h",
"browser/browser_list_proxy.cc",
"browser/browser_list_proxy.h",
@@ -3260,7 +3261,7 @@ diff --git a/weblayer/BUILD.gn b/weblayer/BUILD.gn
diff --git a/weblayer/test/BUILD.gn b/weblayer/test/BUILD.gn
--- a/weblayer/test/BUILD.gn
+++ b/weblayer/test/BUILD.gn
@@ -244,7 +244,6 @@ test("weblayer_browsertests") {
@@ -243,7 +243,6 @@ test("weblayer_browsertests") {
"//components/page_info/android",
"//components/safe_browsing/android:safe_browsing_api_handler",
"//components/safe_browsing/content/browser",
build/patches/Disable-safety-check.patch
+20 -20
View File
@@ -6,32 +6,32 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
chrome/android/BUILD.gn | 5 -----
chrome/android/chrome_java_sources.gni | 1 -
.../browser/app/omnibox/OmniboxPedalDelegateImpl.java | 8 --------
.../browser/app/omnibox/ActionChipsDelegateImpl.java | 8 --------
chrome/browser/BUILD.gn | 1 -
4 files changed, 15 deletions(-)
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -322,7 +322,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/profiles/android:java",
"//chrome/browser/quick_delete:java",
@@ -314,7 +314,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/recent_tabs:factory_java",
"//chrome/browser/recent_tabs:java",
"//chrome/browser/safe_browsing/android:java",
- "//chrome/browser/safety_check/android:java",
"//chrome/browser/search_engines/android:java",
"//chrome/browser/search_resumption:java",
"//chrome/browser/segmentation_platform:factory_java",
@@ -904,8 +903,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/privacy_guide/android:java",
"//chrome/browser/privacy_guide/android:junit",
"//chrome/browser/profiles/android:java",
@@ -895,8 +894,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/quick_delete:junit",
"//chrome/browser/recent_tabs:java",
"//chrome/browser/recent_tabs/internal:junit",
- "//chrome/browser/safety_check/android:java",
- "//chrome/browser/safety_check/android:junit",
"//chrome/browser/search_engines/android:java",
"//chrome/browser/search_resumption:junit",
"//chrome/browser/segmentation_platform:factory_java",
@@ -1444,8 +1441,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/profiles/android:java",
@@ -1438,8 +1435,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/quick_delete:javatests",
"//chrome/browser/safe_browsing/android:java",
"//chrome/browser/safe_browsing/android:javatests",
- "//chrome/browser/safety_check/android:java",
@@ -42,7 +42,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
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
@@ -926,7 +926,6 @@ chrome_java_sources = [
@@ -927,7 +927,6 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingPasswordReuseDialogBridge.java",
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingReferringAppBridge.java",
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingSettingsLauncher.java",
@@ -50,18 +50,18 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
"java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java",
"java/src/org/chromium/chrome/browser/searchwidget/SearchActivityLocationBarLayout.java",
"java/src/org/chromium/chrome/browser/searchwidget/SearchBoxDataProvider.java",
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/OmniboxPedalDelegateImpl.java
@@ -33,7 +33,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.SuggestionsMetrics;
import org.chromium.chrome.browser.omnibox.suggestions.pedal.PedalViewProperties.PedalIcon;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/ActionChipsDelegateImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/ActionChipsDelegateImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/ActionChipsDelegateImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/ActionChipsDelegateImpl.java
@@ -32,7 +32,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.ActionChipsDelegate;
import org.chromium.chrome.browser.omnibox.suggestions.SuggestionsMetrics;
import org.chromium.chrome.browser.password_manager.ManagePasswordsReferrer;
import org.chromium.chrome.browser.password_manager.PasswordManagerLauncher;
-import org.chromium.chrome.browser.safety_check.SafetyCheckSettingsFragment;
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
import org.chromium.components.browser_ui.accessibility.AccessibilitySettings;
import org.chromium.components.browser_ui.settings.SettingsLauncher;
@@ -96,12 +95,6 @@ public class OmniboxPedalDelegateImpl implements OmniboxPedalDelegate {
@@ -96,12 +95,6 @@ public class ActionChipsDelegateImpl implements ActionChipsDelegate {
startActivity(intent);
}
break;
@@ -74,7 +74,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Omn
case OmniboxPedalType.MANAGE_SITE_SETTINGS:
settingsLauncher.launchSettingsActivity(mActivity, SiteSettings.class);
break;
@@ -198,7 +191,6 @@ public class OmniboxPedalDelegateImpl implements OmniboxPedalDelegate {
@@ -198,7 +191,6 @@ public class ActionChipsDelegateImpl implements ActionChipsDelegate {
case OmniboxPedalType.MANAGE_PASSWORDS:
case OmniboxPedalType.UPDATE_CREDIT_CARD:
case OmniboxPedalType.LAUNCH_INCOGNITO:
@@ -85,9 +85,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/omnibox/Omn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -3299,7 +3299,6 @@ static_library("browser") {
"//chrome/browser/privacy_sandbox/android:jni_headers",
@@ -3261,7 +3261,6 @@ static_library("browser") {
"//chrome/browser/reading_list/android",
"//chrome/browser/recent_tabs:jni_headers",
"//chrome/browser/safe_browsing/android:safe_browsing_enums",
- "//chrome/browser/safety_check/android",
"//chrome/browser/search_resumption:jni_headers",
build/patches/Disable-support-for-RAR-files-inspection.patch
+52 -51
View File
@@ -4,15 +4,16 @@ Subject: Disable support for RAR files inspection
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../download_protection/file_analyzer.cc | 2 +-
chrome/common/safe_browsing/BUILD.gn | 19 -------------------
.../file_util/safe_archive_analyzer.cc | 4 +---
3 files changed, 2 insertions(+), 23 deletions(-)
.../download_protection/file_analyzer.cc | 2 +-
chrome/common/safe_browsing/BUILD.gn | 2 --
.../services/file_util/safe_archive_analyzer.cc | 17 +++--------------
.../services/file_util/safe_archive_analyzer.h | 2 --
4 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
--- a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
+++ b/chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -95,7 +95,7 @@ void FileAnalyzer::Start(const base::FilePath& target_path,
@@ -78,7 +78,7 @@ void FileAnalyzer::Start(const base::FilePath& target_path,
if (inspection_type == DownloadFileType::ZIP) {
StartExtractZipFeatures();
} else if (inspection_type == DownloadFileType::RAR) {
@@ -24,60 +25,60 @@ diff --git a/chrome/browser/safe_browsing/download_protection/file_analyzer.cc b
diff --git a/chrome/common/safe_browsing/BUILD.gn b/chrome/common/safe_browsing/BUILD.gn
--- a/chrome/common/safe_browsing/BUILD.gn
+++ b/chrome/common/safe_browsing/BUILD.gn
@@ -56,24 +56,6 @@ if (safe_browsing_mode == 1) {
public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
}
- source_set("rar_analyzer") {
- sources = [
@@ -137,8 +137,6 @@ source_set("safe_browsing") {
"protobuf_message_log_macros.h",
"protobuf_message_read_macros.h",
"protobuf_message_write_macros.h",
- "rar_analyzer.cc",
- "rar_analyzer.h",
- ]
-
- deps = [
- ":archive_analyzer_results",
- ":download_type_util",
- "//base",
- "//base:i18n",
- "//components/safe_browsing/core/common",
- "//third_party/unrar:unrar",
- ]
-
- public_deps = [ "//components/safe_browsing/core/common/proto:csd_proto" ]
- }
-
if (is_linux || is_win) {
source_set("document_analyzer") {
sources = [
@@ -165,7 +147,6 @@ source_set("safe_browsing") {
":archive_analyzer_results",
":binary_feature_extractor",
":download_type_util",
- ":rar_analyzer",
"//components/safe_browsing/core/common",
"//third_party/lzma_sdk/google:seven_zip_reader",
]
"seven_zip_analyzer.cc",
"seven_zip_analyzer.h",
"zip_analyzer.cc",
diff --git a/chrome/services/file_util/safe_archive_analyzer.cc b/chrome/services/file_util/safe_archive_analyzer.cc
--- a/chrome/services/file_util/safe_archive_analyzer.cc
+++ b/chrome/services/file_util/safe_archive_analyzer.cc
@@ -6,7 +6,6 @@
#include "build/build_config.h"
#include "chrome/common/safe_browsing/archive_analyzer_results.h"
-#include "chrome/common/safe_browsing/rar_analyzer.h"
#include "chrome/common/safe_browsing/seven_zip_analyzer.h"
#include "chrome/common/safe_browsing/zip_analyzer.h"
@@ -47,9 +46,8 @@ void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file,
AnalyzeRarFileCallback callback) {
@@ -62,20 +62,9 @@ void SafeArchiveAnalyzer::AnalyzeRarFile(
mojo::PendingRemote<chrome::mojom::TemporaryFileGetter> temp_file_getter,
AnalyzeRarFileCallback callback) {
DCHECK(rar_file.IsValid());
- temp_file_getter_.Bind(std::move(temp_file_getter));
- callback_ = std::move(callback);
- AnalysisFinishedCallback analysis_finished_callback =
- base::BindOnce(&SafeArchiveAnalyzer::AnalysisFinished,
- weak_factory_.GetWeakPtr(), base::FilePath());
- base::RepeatingCallback<void(GetTempFileCallback callback)>
- temp_file_getter_callback =
- base::BindRepeating(&SafeArchiveAnalyzer::RequestTemporaryFile,
- weak_factory_.GetWeakPtr());
- timeout_timer_.Start(FROM_HERE, kArchiveAnalysisTimeout, this,
- &SafeArchiveAnalyzer::Timeout);
- rar_analyzer_.Init(std::move(rar_file), base::FilePath(),
- std::move(analysis_finished_callback),
- std::move(temp_file_getter_callback), &results_);
+ LOG(FATAL) << "AnalyzeRarFile is disabled in this build";
safe_browsing::ArchiveAnalyzerResults results;
- safe_browsing::rar_analyzer::AnalyzeRarFile(
- std::move(rar_file), std::move(temporary_file), &results);
std::move(callback).Run(results);
+ safe_browsing::ArchiveAnalyzerResults results;
+ std::move(callback).Run(results);
}
void SafeArchiveAnalyzer::AnalyzeSevenZipFile(
diff --git a/chrome/services/file_util/safe_archive_analyzer.h b/chrome/services/file_util/safe_archive_analyzer.h
--- a/chrome/services/file_util/safe_archive_analyzer.h
+++ b/chrome/services/file_util/safe_archive_analyzer.h
@@ -6,7 +6,6 @@
#define CHROME_SERVICES_FILE_UTIL_SAFE_ARCHIVE_ANALYZER_H_
#include "chrome/common/safe_browsing/archive_analyzer_results.h"
-#include "chrome/common/safe_browsing/rar_analyzer.h"
#include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
#include "mojo/public/cpp/bindings/remote.h"
@@ -59,7 +58,6 @@ class SafeArchiveAnalyzer : public chrome::mojom::SafeArchiveAnalyzer {
void Timeout();
safe_browsing::ZipAnalyzer zip_analyzer_;
- safe_browsing::RarAnalyzer rar_analyzer_;
// A timer to ensure no archive takes too long to unpack.
base::OneShotTimer timeout_timer_;
--
2.25.1
build/patches/Enable-native-Android-autofill.patch
+82 -119
View File
@@ -23,11 +23,9 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
chrome/browser/BUILD.gn | 7 ++
chrome/browser/android/tab_android.cc | 23 ++++++
chrome/browser/android/tab_android.h | 2 +
.../tab_web_contents_delegate_android.cc | 3 +-
.../browser/extensions/extension_view_host.cc | 3 +-
.../strings/android_chrome_strings.grd | 6 ++
chrome/browser/ui/tab_helpers.cc | 6 +-
.../presentation_receiver_window_view.cc | 3 +-
chrome/browser/ui/tab_helpers.cc | 3 +
.../browser/android_autofill_manager.cc | 2 +-
.../browser/android_autofill_manager.h | 4 +-
.../browser/content_autofill_driver.cc | 30 +++++++
@@ -39,25 +37,25 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../autofill/core/common/autofill_prefs.h | 2 +
.../embedder_support/view/ContentView.java | 46 +++++++++++
.../chromium/ui/base/ViewAndroidDelegate.java | 8 ++
24 files changed, 314 insertions(+), 12 deletions(-)
22 files changed, 308 insertions(+), 9 deletions(-)
diff --git a/android_webview/browser/aw_contents.cc b/android_webview/browser/aw_contents.cc
--- a/android_webview/browser/aw_contents.cc
+++ b/android_webview/browser/aw_contents.cc
@@ -336,7 +336,8 @@ void AwContents::InitAutofillIfNecessary(bool autocomplete_enabled) {
AwAutofillClient::FromWebContents(web_contents))
: base::BindRepeating(&autofill::BrowserDriverInitHook,
AwAutofillClient::FromWebContents(web_contents),
- base::android::GetDefaultLocaleString());
+ base::android::GetDefaultLocaleString(),
@@ -213,7 +213,8 @@ AwBrowserPermissionRequestDelegate* AwBrowserPermissionRequestDelegate::FromID(
AwSafeBrowsingUIManager::UIManagerClient*
AwSafeBrowsingUIManager::UIManagerClient::FromWebContents(
WebContents* web_contents) {
- return AwContents::FromWebContents(web_contents);
+ return AwContents::FromWebContents(web_contents,
+ /*enable_secondary_autofill_manager*/ false);
}
ContentAutofillDriverFactory::CreateForWebContentsAndDelegate(
web_contents, AwAutofillClient::FromWebContents(web_contents),
// static
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -340,6 +340,7 @@ if (current_toolchain == default_toolchain) {
@@ -332,6 +332,7 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser/ui/android/favicon:java",
"//chrome/browser/ui/android/layouts:java",
"//chrome/browser/ui/android/layouts/glue:java",
@@ -68,7 +66,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@@ -55,13 +55,18 @@ import java.lang.annotation.Retention;
@@ -56,6 +56,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.Locale;
@@ -80,15 +78,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
/**
* The "Passwords" screen in Settings, which allows the user to enable or disable password saving,
* to view saved passwords (just the username and URL), and to delete saved passwords.
*/
@@ -63,7 +68,7 @@ import java.util.Locale;
public class PasswordSettings extends PreferenceFragmentCompat
implements PasswordManagerHandler.PasswordListObserver,
- Preference.OnPreferenceClickListener {
+ Preference.OnPreferenceClickListener, INeedSnackbarManager {
Preference.OnPreferenceClickListener,
- FragmentHelpAndFeedbackLauncher {
+ FragmentHelpAndFeedbackLauncher, INeedSnackbarManager {
@IntDef({TrustedVaultBannerState.NOT_SHOWN, TrustedVaultBannerState.OFFER_OPT_IN,
TrustedVaultBannerState.OPTED_IN})
@Retention(RetentionPolicy.SOURCE)
@@ -90,6 +95,12 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -92,6 +97,12 @@ public class PasswordSettings extends PreferenceFragmentCompat
public static final String PASSWORD_EXPORT_EVENT_HISTOGRAM =
"PasswordManager.PasswordExport.Event";
@@ -101,16 +100,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
private static final String PREF_KEY_CATEGORY_SAVED_PASSWORDS = "saved_passwords";
private static final String PREF_KEY_CATEGORY_EXCEPTIONS = "exceptions";
private static final String PREF_KEY_SAVED_PASSWORDS_NO_TEXT = "saved_passwords_no_text";
@@ -120,6 +131,8 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -122,6 +133,8 @@ public class PasswordSettings extends PreferenceFragmentCompat
private Preference mLinkPref;
private Menu mMenu;
+ private ChromeSwitchPreference mEnableAndroidAutofillSwitch;
+ private ChromeSwitchPreference mEnableAndroidAutofillIncognitoSwitch;
private @ManagePasswordsReferrer int mManagePasswordsReferrer;
private HelpAndFeedbackLauncher mHelpAndFeedbackLauncher;
/**
@@ -284,6 +297,7 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -286,6 +299,7 @@ public class PasswordSettings extends PreferenceFragmentCompat
}
createSavePasswordsSwitch();
@@ -118,7 +117,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
createAutoSignInCheckbox();
if (mTrustedVaultBannerState == TrustedVaultBannerState.OPTED_IN) {
@@ -518,6 +532,71 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -520,6 +534,71 @@ public class PasswordSettings extends PreferenceFragmentCompat
getPrefService().getBoolean(Pref.CREDENTIALS_ENABLE_SERVICE));
}
@@ -193,7 +192,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.java
@@ -73,6 +73,17 @@ import org.chromium.ui.base.WindowAndroid;
@@ -75,6 +75,17 @@ import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.util.ColorUtils;
import org.chromium.url.GURL;
@@ -211,16 +210,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
/**
* Implementation of the interface {@link Tab}. Contains and manages a {@link ContentView}.
* This class is not intended to be extended.
@@ -210,6 +221,8 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
private int mThemeColor;
@@ -213,6 +224,8 @@ public class TabImpl implements Tab {
private boolean mUsedCriticalPersistedTabData;
private boolean mIsWebContentObscured;
+ AutofillProvider mAutofillProvider;
+
/**
* Creates an instance of a {@link TabImpl}.
*
@@ -774,6 +787,11 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
@@ -777,6 +790,11 @@ public class TabImpl implements Tab {
for (TabObserver observer : mObservers) observer.onDestroyed(this);
mObservers.clear();
@@ -232,7 +231,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
mUserDataHost.destroy();
mTabViewManager.destroy();
hideNativePage(false, null);
@@ -1355,6 +1373,16 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
@@ -1356,6 +1374,16 @@ public class TabImpl implements Tab {
return tabsPtrArray;
}
@@ -249,7 +248,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
/**
* Initializes the {@link WebContents}. Completes the browser content components initialization
* around a native WebContents pointer.
@@ -1404,6 +1432,27 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
@@ -1405,6 +1433,27 @@ public class TabImpl implements Tab {
mDelegateFactory.createContextMenuPopulatorFactory(this), this));
mWebContents.notifyRendererPreferenceUpdate();
@@ -277,7 +276,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
TabHelpers.initWebContentsHelpers(this);
notifyContentChanged();
} finally {
@@ -1740,6 +1789,7 @@ public class TabImpl implements Tab, TabObscuringHandler.Observer {
@@ -1747,6 +1796,7 @@ public class TabImpl implements Tab {
void setActiveNavigationEntryTitleForUrl(long nativeTabAndroid, String url, String title);
void loadOriginalImage(long nativeTabAndroid);
boolean handleNonNavigationAboutURL(GURL url);
@@ -288,7 +287,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabImpl.jav
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndroidDelegate.java
@@ -21,6 +21,10 @@ import org.chromium.ui.dragdrop.DragAndDropBrowserDelegate;
@@ -22,6 +22,10 @@ import org.chromium.ui.dragdrop.DragAndDropBrowserDelegate;
import org.chromium.ui.dragdrop.DragAndDropDelegate;
import org.chromium.ui.dragdrop.DragStateTracker;
@@ -299,7 +298,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr
/**
* Implementation of the abstract class {@link ViewAndroidDelegate} for Chrome.
*/
@@ -85,6 +89,16 @@ public class TabViewAndroidDelegate extends ViewAndroidDelegate {
@@ -87,6 +91,16 @@ public class TabViewAndroidDelegate extends ViewAndroidDelegate {
mTab.onBackgroundColorChanged(color);
}
@@ -319,7 +318,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabViewAndr
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2506,6 +2506,13 @@ static_library("browser") {
@@ -2469,6 +2469,13 @@ static_library("browser") {
deps += [ "//chrome/browser/error_reporting" ]
}
@@ -382,28 +381,15 @@ diff --git a/chrome/browser/android/tab_android.h b/chrome/browser/android/tab_a
private:
JavaObjectWeakGlobalRef weak_java_tab_;
diff --git a/chrome/browser/android/tab_web_contents_delegate_android.cc b/chrome/browser/android/tab_web_contents_delegate_android.cc
--- a/chrome/browser/android/tab_web_contents_delegate_android.cc
+++ b/chrome/browser/android/tab_web_contents_delegate_android.cc
@@ -168,7 +168,8 @@ void TabWebContentsDelegateAndroid::PortalWebContentsCreated(
base::BindRepeating(
&autofill::BrowserDriverInitHook,
autofill::ChromeAutofillClient::FromWebContents(portal_contents),
- g_browser_process->GetApplicationLocale()));
+ g_browser_process->GetApplicationLocale(),
+ /*enable_secondary_autofill_manager*/ true));
ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
portal_contents,
autofill::ChromeAutofillClient::FromWebContents(portal_contents));
diff --git a/chrome/browser/extensions/extension_view_host.cc b/chrome/browser/extensions/extension_view_host.cc
--- a/chrome/browser/extensions/extension_view_host.cc
+++ b/chrome/browser/extensions/extension_view_host.cc
@@ -59,7 +59,8 @@ ExtensionViewHost::ExtensionViewHost(const Extension* extension,
base::BindRepeating(
&autofill::BrowserDriverInitHook,
autofill::ChromeAutofillClient::FromWebContents(host_contents()),
- g_browser_process->GetApplicationLocale()));
+ g_browser_process->GetApplicationLocale(),
@@ -52,7 +52,8 @@ ExtensionViewHost::ExtensionViewHost(const Extension* extension,
// Attach WebContents helpers. Extension tabs automatically get them attached
// in TabHelpers::AttachTabHelpers, but popups don't.
// TODO(kalman): How much of TabHelpers::AttachTabHelpers should be here?
- autofill::ChromeAutofillClient::CreateForWebContents(host_contents());
+ autofill::ChromeAutofillClient::CreateForWebContents(host_contents(,
+ /*enable_secondary_autofill_manager*/ false));
// The popup itself cannot be zoomed, but we must specify a zoom level to use.
@@ -411,7 +397,7 @@ diff --git a/chrome/browser/extensions/extension_view_host.cc b/chrome/browser/e
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -598,6 +598,12 @@ CHAR_LIMIT guidelines:
@@ -601,6 +601,12 @@ CHAR_LIMIT guidelines:
<message name="IDS_PASSWORD_SETTINGS_SAVE_PASSWORDS" desc="Title for the checkbox toggling whether passwords are saved or not. [CHAR_LIMIT=32]">
Save passwords
</message>
@@ -427,7 +413,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -166,6 +166,9 @@
@@ -165,6 +165,9 @@
#include "chrome/browser/ui/javascript_dialogs/javascript_tab_modal_dialog_manager_delegate_android.h"
#include "chrome/browser/video_tutorials/video_tutorial_tab_helper.h"
#include "content/public/common/content_features.h"
@@ -437,29 +423,6 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
#else
#include "chrome/browser/banners/app_banner_manager_desktop.h"
#include "chrome/browser/preloading/prefetch/zero_suggest_prefetch/zero_suggest_prefetch_tab_helper.h"
@@ -319,7 +322,8 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) {
base::BindRepeating(
&autofill::BrowserDriverInitHook,
autofill::ChromeAutofillClient::FromWebContents(web_contents),
- g_browser_process->GetApplicationLocale()));
+ g_browser_process->GetApplicationLocale(),
+ /*enable_secondary_autofill_manager*/true));
if (breadcrumbs::IsEnabled())
BreadcrumbManagerTabHelper::CreateForWebContents(web_contents);
chrome_browser_net::NetErrorTabHelper::CreateForWebContents(web_contents);
diff --git a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
--- a/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
+++ b/chrome/browser/ui/views/media_router/presentation_receiver_window_view.cc
@@ -174,7 +174,8 @@ void PresentationReceiverWindowView::Init() {
base::BindRepeating(
&autofill::BrowserDriverInitHook,
autofill::ChromeAutofillClient::FromWebContents(web_contents),
- g_browser_process->GetApplicationLocale()));
+ g_browser_process->GetApplicationLocale(),
+ /*enable_secondary_autofill_manager*/ false));
ChromePasswordManagerClient::CreateForWebContentsWithAutofillClient(
web_contents,
autofill::ChromeAutofillClient::FromWebContents(web_contents));
diff --git a/components/android_autofill/browser/android_autofill_manager.cc b/components/android_autofill/browser/android_autofill_manager.cc
--- a/components/android_autofill/browser/android_autofill_manager.cc
+++ b/components/android_autofill/browser/android_autofill_manager.cc
@@ -475,7 +438,7 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.cc b/c
diff --git a/components/android_autofill/browser/android_autofill_manager.h b/components/android_autofill/browser/android_autofill_manager.h
--- a/components/android_autofill/browser/android_autofill_manager.h
+++ b/components/android_autofill/browser/android_autofill_manager.h
@@ -84,12 +84,12 @@ class AndroidAutofillManager : public AutofillManager {
@@ -86,12 +86,12 @@ class AndroidAutofillManager : public AutofillManager {
const FieldTypeGroup field_type_group,
const url::Origin& triggered_origin);
@@ -493,55 +456,55 @@ diff --git a/components/android_autofill/browser/android_autofill_manager.h b/co
diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc
--- a/components/autofill/content/browser/content_autofill_driver.cc
+++ b/components/autofill/content/browser/content_autofill_driver.cc
@@ -326,6 +326,8 @@ void ContentAutofillDriver::FormsSeen(
const std::vector<FormData>& updated_forms,
@@ -336,6 +336,8 @@ void ContentAutofillDriver::FormsSeen(
const std::vector<FormGlobalId>& removed_forms) {
target->autofill_manager_->OnFormsSeen(updated_forms, removed_forms);
target->autofill_manager_->OnFormsSeen(WithNewVersion(updated_forms),
removed_forms);
+ if (target->secondary_autofill_manager_)
+ target->secondary_autofill_manager_->OnFormsSeen(updated_forms, removed_forms);
});
}
@@ -352,6 +354,8 @@ void ContentAutofillDriver::FormSubmitted(
@@ -362,6 +364,8 @@ void ContentAutofillDriver::FormSubmitted(
}
target->autofill_manager_->OnFormSubmitted(form, known_success,
submission_source);
target->autofill_manager_->OnFormSubmitted(
WithNewVersion(form), known_success, submission_source);
+ if (target->secondary_autofill_manager_)
+ target->secondary_autofill_manager_->OnFormSubmitted(form, known_success, submission_source);
});
}
@@ -372,6 +376,8 @@ void ContentAutofillDriver::TextFieldDidChange(const FormData& raw_form,
@@ -382,6 +386,8 @@ void ContentAutofillDriver::TextFieldDidChange(const FormData& raw_form,
base::TimeTicks timestamp) {
target->autofill_manager_->OnTextFieldDidChange(
form, field, bounding_box, timestamp);
WithNewVersion(form), field, bounding_box, timestamp);
+ if (target->secondary_autofill_manager_)
+ target->secondary_autofill_manager_->OnTextFieldDidChange(form, field, bounding_box, timestamp);
});
}
@@ -390,6 +396,8 @@ void ContentAutofillDriver::TextFieldDidScroll(const FormData& raw_form,
@@ -400,6 +406,8 @@ void ContentAutofillDriver::TextFieldDidScroll(const FormData& raw_form,
const FormFieldData& field, const gfx::RectF& bounding_box) {
target->autofill_manager_->OnTextFieldDidScroll(form, field,
bounding_box);
target->autofill_manager_->OnTextFieldDidScroll(WithNewVersion(form),
field, bounding_box);
+ if (target->secondary_autofill_manager_)
+ target->secondary_autofill_manager_->OnTextFieldDidScroll(form, field, bounding_box);
});
}
@@ -409,6 +417,8 @@ void ContentAutofillDriver::SelectControlDidChange(
@@ -419,6 +427,8 @@ void ContentAutofillDriver::SelectControlDidChange(
const FormFieldData& field, const gfx::RectF& bounding_box) {
target->autofill_manager_->OnSelectControlDidChange(form, field,
bounding_box);
target->autofill_manager_->OnSelectControlDidChange(
WithNewVersion(form), field, bounding_box);
+ if (target->secondary_autofill_manager_)
+ target->secondary_autofill_manager_->OnSelectControlDidChange(form, field, bounding_box);
});
}
@@ -434,6 +444,10 @@ void ContentAutofillDriver::AskForValuesToFill(
@@ -444,6 +454,10 @@ void ContentAutofillDriver::AskForValuesToFill(
target->autofill_manager_->OnAskForValuesToFill(
form, field, bounding_box, autoselect_first_suggestion,
form_element_was_clicked);
WithNewVersion(form), field, bounding_box,
autoselect_first_suggestion, form_element_was_clicked);
+ if (target->secondary_autofill_manager_)
+ target->secondary_autofill_manager_->OnAskForValuesToFill(form, field, bounding_box,
+ autoselect_first_suggestion,
@@ -549,7 +512,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
});
}
@@ -444,12 +458,16 @@ void ContentAutofillDriver::HidePopup() {
@@ -454,12 +468,16 @@ void ContentAutofillDriver::HidePopup() {
DCHECK(!target->IsPrerendering())
<< "We should never affect UI while prerendering";
target->autofill_manager_->OnHidePopup();
@@ -566,25 +529,25 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
}
void ContentAutofillDriver::FocusNoLongerOnForm(bool had_interacted_form) {
@@ -477,6 +495,8 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form,
@@ -487,6 +505,8 @@ void ContentAutofillDriver::FocusOnFormField(const FormData& raw_form,
const FormFieldData& field, const gfx::RectF& bounding_box) {
target->autofill_manager_->OnFocusOnFormField(form, field,
bounding_box);
target->autofill_manager_->OnFocusOnFormField(WithNewVersion(form),
field, bounding_box);
+ if (target->secondary_autofill_manager_)
+ target->secondary_autofill_manager_->OnFocusOnFormField(form, field, bounding_box);
});
}
@@ -489,6 +509,8 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form,
[](ContentAutofillDriver* target, const FormData& form,
@@ -500,6 +520,8 @@ void ContentAutofillDriver::DidFillAutofillFormData(const FormData& raw_form,
base::TimeTicks timestamp) {
target->autofill_manager_->OnDidFillAutofillFormData(form, timestamp);
target->autofill_manager_->OnDidFillAutofillFormData(
WithNewVersion(form), timestamp);
+ if (target->secondary_autofill_manager_)
+ target->secondary_autofill_manager_->OnDidFillAutofillFormData(form, timestamp);
});
}
@@ -498,6 +520,8 @@ void ContentAutofillDriver::DidPreviewAutofillFormData() {
@@ -509,6 +531,8 @@ void ContentAutofillDriver::DidPreviewAutofillFormData() {
autofill_router().DidPreviewAutofillFormData(
this, [](ContentAutofillDriver* target) {
target->autofill_manager_->OnDidPreviewAutofillFormData();
@@ -593,7 +556,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
});
}
@@ -507,6 +531,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() {
@@ -518,6 +542,8 @@ void ContentAutofillDriver::DidEndTextFieldEditing() {
autofill_router().DidEndTextFieldEditing(
this, [](ContentAutofillDriver* target) {
target->autofill_manager_->OnDidEndTextFieldEditing();
@@ -602,18 +565,18 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
});
}
@@ -518,6 +544,8 @@ void ContentAutofillDriver::SelectFieldOptionsDidChange(
this, GetFormWithFrameAndFormMetaData(raw_form),
@@ -530,6 +556,8 @@ void ContentAutofillDriver::SelectFieldOptionsDidChange(
[](ContentAutofillDriver* target, const FormData& form) {
target->autofill_manager_->OnSelectFieldOptionsDidChange(form);
target->autofill_manager_->OnSelectFieldOptionsDidChange(
WithNewVersion(form));
+ if (target->secondary_autofill_manager_)
+ target->secondary_autofill_manager_->OnSelectFieldOptionsDidChange(form);
});
}
@@ -592,6 +620,8 @@ void ContentAutofillDriver::DidNavigateFrame(
if (autofill_router_) // Can be nullptr only in tests.
autofill_router_->UnregisterDriver(this);
@@ -597,6 +625,8 @@ void ContentAutofillDriver::DidNavigateFrame(
submitted_forms_.clear();
autofill_router_->UnregisterDriver(this);
autofill_manager_->Reset();
+ if (secondary_autofill_manager_)
+ secondary_autofill_manager_->Reset();
@@ -623,7 +586,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/co
diff --git a/components/autofill/content/browser/content_autofill_driver.h b/components/autofill/content/browser/content_autofill_driver.h
--- a/components/autofill/content/browser/content_autofill_driver.h
+++ b/components/autofill/content/browser/content_autofill_driver.h
@@ -127,10 +127,13 @@ class ContentAutofillDriver : public AutofillDriver,
@@ -126,10 +126,13 @@ class ContentAutofillDriver : public AutofillDriver,
ContentAutofillDriver& operator=(const ContentAutofillDriver&) = delete;
~ContentAutofillDriver() override;
@@ -638,7 +601,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com
content::RenderFrameHost* render_frame_host() { return render_frame_host_; }
@@ -349,6 +352,10 @@ class ContentAutofillDriver : public AutofillDriver,
@@ -345,6 +348,10 @@ class ContentAutofillDriver : public AutofillDriver,
// code.
std::unique_ptr<AutofillManager> autofill_manager_ = nullptr;
@@ -652,7 +615,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver.h b/com
diff --git a/components/autofill/content/browser/content_autofill_driver_factory.cc b/components/autofill/content/browser/content_autofill_driver_factory.cc
--- a/components/autofill/content/browser/content_autofill_driver_factory.cc
+++ b/components/autofill/content/browser/content_autofill_driver_factory.cc
@@ -13,6 +13,7 @@
@@ -14,6 +14,7 @@
#include "components/autofill/content/browser/content_autofill_driver.h"
#include "components/autofill/core/browser/browser_autofill_manager.h"
#include "components/autofill/core/common/autofill_features.h"
@@ -660,7 +623,7 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory
#include "content/public/browser/global_routing_id.h"
#include "content/public/browser/navigation_handle.h"
#include "content/public/browser/render_frame_host.h"
@@ -42,9 +43,17 @@ bool ShouldEnableHeavyFormDataScraping(const version_info::Channel channel) {
@@ -43,9 +44,17 @@ bool ShouldEnableHeavyFormDataScraping(const version_info::Channel channel) {
void BrowserDriverInitHook(AutofillClient* client,
const std::string& app_locale,
@@ -682,18 +645,18 @@ diff --git a/components/autofill/content/browser/content_autofill_driver_factory
diff --git a/components/autofill/content/browser/content_autofill_driver_factory.h b/components/autofill/content/browser/content_autofill_driver_factory.h
--- a/components/autofill/content/browser/content_autofill_driver_factory.h
+++ b/components/autofill/content/browser/content_autofill_driver_factory.h
@@ -34,6 +34,7 @@ class ContentAutofillDriver;
@@ -35,6 +35,7 @@ class ContentAutofillDriver;
// other implementations.
void BrowserDriverInitHook(AutofillClient* client,
const std::string& app_locale,
+ bool enable_secondary_autofill_manager,
ContentAutofillDriver* driver);
// Manages lifetime of ContentAutofillDriver. One Factory per WebContents
// Manages lifetime of ContentAutofillDriver. Owned by ContentAutofillClient,
diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc
--- a/components/autofill/content/renderer/password_autofill_agent.cc
+++ b/components/autofill/content/renderer/password_autofill_agent.cc
@@ -806,7 +806,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange(
@@ -807,7 +807,10 @@ void PasswordAutofillAgent::UpdateStateForTextChange(
void PasswordAutofillAgent::TrackAutofilledElement(
const blink::WebFormControlElement& element) {
@@ -708,7 +671,7 @@ diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/c
diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/autofill/core/common/autofill_prefs.cc
--- a/components/autofill/core/common/autofill_prefs.cc
+++ b/components/autofill/core/common/autofill_prefs.cc
@@ -100,6 +100,10 @@ const char kAutofillWalletImportEnabled[] = "autofill.wallet_import_enabled";
@@ -106,6 +106,10 @@ const char kAutofillWalletImportEnabled[] = "autofill.wallet_import_enabled";
const char kAutocompleteLastVersionRetentionPolicy[] =
"autocomplete.retention_policy_last_version";
@@ -719,7 +682,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Synced prefs. Used for cross-device choices, e.g., credit card Autofill.
registry->RegisterBooleanPref(
@@ -127,6 +131,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -135,6 +139,8 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
prefs::kAutofillCreditCardFidoAuthOfferCheckboxState, true);
#endif
registry->RegisterBooleanPref(prefs::kAutofillWalletImportEnabled, true);
@@ -731,7 +694,7 @@ diff --git a/components/autofill/core/common/autofill_prefs.cc b/components/auto
diff --git a/components/autofill/core/common/autofill_prefs.h b/components/autofill/core/common/autofill_prefs.h
--- a/components/autofill/core/common/autofill_prefs.h
+++ b/components/autofill/core/common/autofill_prefs.h
@@ -44,6 +44,8 @@ extern const char kAutofillUploadEvents[];
@@ -45,6 +45,8 @@ extern const char kAutofillUploadEvents[];
extern const char kAutofillUploadEventsLastResetTimestamp[];
extern const char kAutofillWalletImportEnabled[];
extern const char kAutocompleteLastVersionRetentionPolicy[];
build/patches/Logcat-crash-reports-UI.patch
+25 -24
View File
@@ -6,7 +6,7 @@ Original License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../crash/MinidumpUploadServiceImpl.java | 22 +++
.../crash_upload_list_android.cc | 22 ++-
.../crash_upload_list_android.cc | 25 ++-
.../crash_upload_list_android.h | 1 +
chrome/browser/net/chrome_network_delegate.cc | 7 +
chrome/browser/ui/BUILD.gn | 1 +
@@ -23,7 +23,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../upload_list/text_log_upload_list.cc | 1 +
components/upload_list/upload_list.cc | 14 ++
components/upload_list/upload_list.h | 9 +
18 files changed, 373 insertions(+), 133 deletions(-)
18 files changed, 375 insertions(+), 134 deletions(-)
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceImpl.java b/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceImpl.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadServiceImpl.java
@@ -85,7 +85,7 @@ diff --git a/chrome/browser/crash_upload_list/crash_upload_list_android.cc b/chr
+}
+
void CrashUploadListAndroid::LoadUnsuccessfulUploadList(
std::vector<UploadInfo>* uploads) {
std::vector<std::unique_ptr<UploadInfo>>* uploads) {
const char pending_uploads[] = ".dmp";
const char skipped_uploads[] = ".skipped";
const char manually_forced_uploads[] = ".forced";
@@ -111,34 +111,35 @@ diff --git a/chrome/browser/crash_upload_list/crash_upload_list_android.cc b/chr
// Crash reports can have multiple extensions (e.g. foo.dmp, foo.dmp.try1,
// foo.skipped.try0).
file = file.BaseName();
@@ -136,8 +149,15 @@ void CrashUploadListAndroid::LoadUnsuccessfulUploadList(
@@ -136,7 +149,15 @@ void CrashUploadListAndroid::LoadUnsuccessfulUploadList(
RecordUnsuccessfulUploadListState(
UnsuccessfulUploadListState::ADDING_AN_UPLOAD_ENTRY);
id = id.substr(pos + 1);
- uploads->push_back(std::make_unique<UploadList::UploadInfo>(
- id, info.creation_time, upload_state, ui::FormatBytes(file_size)));
+ // Since current thread is an IO thread
+ // to avoid failed DCHECK ThreadRestrictions::AssertSingletonAllowed()
+ // remove ui::FormatBytes(): dcheck fail because it use base::FormatDouble()
+ // and LazyInstance<NumberFormatWrapper>::DestructorAtExit().
+ // also "upload.file_size" is unused.
+ std::u16string file_size_string;
UploadList::UploadInfo upload(id, info.creation_time, upload_state,
- ui::FormatBytes(file_size));
+ file_size_string);
+ auto upload = std::make_unique<UploadList::UploadInfo>(
+ id, info.creation_time, upload_state, file_size_string);
+ upload.file_path = file_path;
uploads->push_back(upload);
+ uploads->push_back(upload);
}
}
diff --git a/chrome/browser/crash_upload_list/crash_upload_list_android.h b/chrome/browser/crash_upload_list/crash_upload_list_android.h
--- a/chrome/browser/crash_upload_list/crash_upload_list_android.h
+++ b/chrome/browser/crash_upload_list/crash_upload_list_android.h
@@ -34,6 +34,7 @@ class CrashUploadListAndroid : public TextLogUploadList {
std::vector<UploadInfo> LoadUploadList() override;
@@ -35,6 +35,7 @@ class CrashUploadListAndroid : public TextLogUploadList {
std::vector<std::unique_ptr<UploadList::UploadInfo>> LoadUploadList()
override;
void RequestSingleUpload(const std::string& local_id) override;
+ void RequestNewExtraction() override;
private:
void LoadUnsuccessfulUploadList(std::vector<UploadInfo>* uploads);
void LoadUnsuccessfulUploadList(
diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
--- a/chrome/browser/net/chrome_network_delegate.cc
+++ b/chrome/browser/net/chrome_network_delegate.cc
@@ -159,7 +160,7 @@ diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/
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
@@ -644,6 +644,7 @@ static_library("ui") {
@@ -646,6 +646,7 @@ static_library("ui") {
"//third_party/re2",
"//third_party/webrtc_overrides:webrtc_component",
"//third_party/zlib",
@@ -879,7 +880,7 @@ diff --git a/components/minidump_uploader/android/java/src/org/chromium/componen
diff --git a/components/upload_list/text_log_upload_list.cc b/components/upload_list/text_log_upload_list.cc
--- a/components/upload_list/text_log_upload_list.cc
+++ b/components/upload_list/text_log_upload_list.cc
@@ -111,6 +111,7 @@ std::unique_ptr<TextLogUploadList::UploadInfo> TryParseCsvLogEntry(
@@ -165,6 +165,7 @@ std::unique_ptr<UploadList::UploadInfo> TextLogUploadList::TryParseCsvLogEntry(
}
auto info = std::make_unique<TextLogUploadList::UploadInfo>(components[1],
upload_time);
@@ -890,8 +891,8 @@ diff --git a/components/upload_list/text_log_upload_list.cc b/components/upload_
diff --git a/components/upload_list/upload_list.cc b/components/upload_list/upload_list.cc
--- a/components/upload_list/upload_list.cc
+++ b/components/upload_list/upload_list.cc
@@ -95,6 +95,11 @@ void UploadList::GetUploads(size_t max_count,
std::back_inserter(*uploads));
@@ -99,6 +99,11 @@ std::vector<const UploadList::UploadInfo*> UploadList::GetUploads(
return uploads;
}
+void UploadList::RequestNewExtraction() {
@@ -899,10 +900,10 @@ diff --git a/components/upload_list/upload_list.cc b/components/upload_list/uplo
+ NOTREACHED();
+}
+
void UploadList::OnLoadComplete(const std::vector<UploadInfo>& uploads) {
uploads_ = uploads;
if (!load_callback_.is_null())
@@ -105,3 +110,12 @@ void UploadList::OnClearComplete() {
void UploadList::OnLoadComplete(
std::vector<std::unique_ptr<UploadInfo>> uploads) {
uploads_ = std::move(uploads);
@@ -111,3 +116,12 @@ void UploadList::OnClearComplete() {
if (!clear_callback_.is_null())
std::move(clear_callback_).Run();
}
@@ -918,7 +919,7 @@ diff --git a/components/upload_list/upload_list.cc b/components/upload_list/uplo
diff --git a/components/upload_list/upload_list.h b/components/upload_list/upload_list.h
--- a/components/upload_list/upload_list.h
+++ b/components/upload_list/upload_list.h
@@ -68,6 +68,9 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
@@ -69,6 +69,9 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
// Formatted file size for locally stored data.
std::u16string file_size;
@@ -928,9 +929,9 @@ diff --git a/components/upload_list/upload_list.h b/components/upload_list/uploa
};
UploadList();
@@ -97,6 +100,12 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
// Must be called only after a Load() callback has been received.
void GetUploads(size_t max_count, std::vector<UploadInfo>* uploads);
@@ -99,6 +102,12 @@ class UploadList : public base::RefCountedThreadSafe<UploadList> {
// The |UploadInfo| pointers are still owned by this |UploadList| instance.
std::vector<const UploadInfo*> GetUploads(size_t max_count) const;
+ // Get full path of crash file for local_id
+ std::string GetFilePathByLocalId(const std::string& local_id);
build/patches/Move-navigation-bar-to-bottom.patch
+125 -130
View File
@@ -28,12 +28,12 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../ChromeAccessibilitySettingsDelegate.java | 52 ++++++++++++
.../chrome/browser/app/ChromeActivity.java | 13 +++
.../browser/app/flags/ChromeCachedFlags.java | 1 +
.../compositor/CompositorViewHolder.java | 9 ++-
.../compositor/CompositorViewHolder.java | 6 ++
.../layouts/LayoutManagerChrome.java | 18 ++++-
.../layouts/LayoutManagerChromeTablet.java | 4 +-
.../layouts/ToolbarSwipeLayout.java | 15 +++-
.../overlays/strip/StripLayoutHelper.java | 2 +-
.../strip/StripLayoutHelperManager.java | 36 +++++++--
.../strip/StripLayoutHelperManager.java | 34 +++++++-
.../scene_layer/StaticTabSceneLayer.java | 8 +-
.../scene_layer/TabListSceneLayer.java | 14 ++++
.../scene_layer/TabStripSceneLayer.java | 15 +++-
@@ -44,7 +44,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../chrome/browser/ntp/NewTabPage.java | 13 ++-
.../chrome/browser/ntp/RecentTabsPage.java | 22 ++++-
.../browser/searchwidget/SearchActivity.java | 13 ++-
.../browser/settings/SettingsActivity.java | 5 ++
.../browser/settings/SettingsActivity.java | 6 +-
.../StatusIndicatorCoordinator.java | 10 +++
.../StatusIndicatorSceneLayer.java | 7 +-
.../browser/toolbar/ToolbarManager.java | 37 +++++++--
@@ -86,7 +86,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../accessibility/AccessibilitySettings.java | 16 ++++
.../AccessibilitySettingsDelegate.java | 6 ++
.../render_widget_host_view_android.cc | 3 +
74 files changed, 868 insertions(+), 61 deletions(-)
74 files changed, 866 insertions(+), 59 deletions(-)
diff --git a/cc/base/features.cc b/cc/base/features.cc
--- a/cc/base/features.cc
@@ -139,7 +139,7 @@ diff --git a/cc/input/browser_controls_offset_manager.cc b/cc/input/browser_cont
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -4265,6 +4265,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
@@ -4274,6 +4274,9 @@ bool LayerTreeHostImpl::AnimateBrowserControls(base::TimeTicks time) {
if (scroll_delta.IsZero())
return false;
@@ -162,7 +162,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
/** The mediator implements the logic to interact with the surfaces and caller. */
class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.OnClickListener,
StartSurface.OnTabSelectingListener, BackPressHandler,
@@ -1241,6 +1244,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -1254,6 +1257,8 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
}
private void setTopMargin(int topMargin) {
@@ -182,7 +182,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
import java.util.List;
@@ -144,7 +145,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T
@@ -143,7 +144,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T
@Override
public void initializeWithNative(Activity activity,
BottomControlsCoordinator.BottomControlsVisibilityController visibilityController,
@@ -192,7 +192,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
try (TraceEvent e = TraceEvent.scoped("TabGroupUiCoordinator.initializeWithNative")) {
if (UmaSessionStats.isMetricsServiceAvailable()) {
UmaSessionStats.registerSyntheticFieldTrial(
@@ -187,7 +189,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T
@@ -186,7 +188,8 @@ public class TabGroupUiCoordinator implements TabGroupUiMediator.ResetHandler, T
mMediator = new TabGroupUiMediator(mActivity, visibilityController, this, mModel,
mTabModelSelector, mTabCreatorManager, mLayoutStateProviderSupplier,
mIncognitoStateProvider, mTabGridDialogControllerSupplier,
@@ -205,7 +205,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java
@@ -48,6 +48,12 @@ import org.chromium.url.GURL;
@@ -47,6 +47,12 @@ import org.chromium.url.GURL;
import java.util.List;
@@ -218,7 +218,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
/**
* A mediator for the TabGroupUi. Responsible for managing the internal state of the component.
*/
@@ -115,13 +121,20 @@ public class TabGroupUiMediator implements BackPressHandler {
@@ -116,6 +122,11 @@ public class TabGroupUiMediator implements BackPressHandler {
private boolean mIsTabGroupUiVisible;
private boolean mIsShowingOverViewMode;
@@ -230,9 +230,10 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
TabGroupUiMediator(Context context, BottomControlsVisibilityController visibilityController,
ResetHandler resetHandler, PropertyModel model, TabModelSelector tabModelSelector,
TabCreatorManager tabCreatorManager,
OneshotSupplier<LayoutStateProvider> layoutStateProviderSupplier,
@@ -123,7 +134,9 @@ public class TabGroupUiMediator implements BackPressHandler {
IncognitoStateProvider incognitoStateProvider,
@Nullable Supplier<TabGridDialogMediator.DialogController> dialogControllerSupplier,
@Nullable OneshotSupplier<TabGridDialogMediator.DialogController>
dialogControllerSupplier,
- ObservableSupplier<Boolean> omniboxFocusStateSupplier) {
+ ObservableSupplier<Boolean> omniboxFocusStateSupplier,
+ TopUiThemeColorProvider topUiThemeColorProvider, ObservableSupplier<Tab> tabSupplier) {
@@ -240,7 +241,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
mContext = context;
mResetHandler = resetHandler;
mModel = model;
@@ -142,10 +155,29 @@ public class TabGroupUiMediator implements BackPressHandler {
@@ -144,10 +157,29 @@ public class TabGroupUiMediator implements BackPressHandler {
mIsShowingOverViewMode = true;
}
@@ -270,7 +271,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
if (TabUiFeatureUtilities.isTabGroupsAndroidEnabled(mContext)
&& getTabsToShowForId(lastId).contains(tab)) {
return;
@@ -202,6 +234,7 @@ public class TabGroupUiMediator implements BackPressHandler {
@@ -204,6 +236,7 @@ public class TabGroupUiMediator implements BackPressHandler {
return;
}
resetTabStripWithRelatedTabsForId(currentTab.getId());
@@ -278,14 +279,19 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
}
@Override
@@ -318,6 +351,20 @@ public class TabGroupUiMediator implements BackPressHandler {
if (tab != null) {
@@ -319,6 +352,8 @@ public class TabGroupUiMediator implements BackPressHandler {
resetTabStripWithRelatedTabsForId(tab.getId());
}
+
+ mTabObserver.triggerWithCurrentTab();
+ }
+
mBackPressStateSupplier = new ObservableSupplierImpl<>();
if (mTabGridDialogControllerSupplier != null) {
mTabGridDialogControllerSupplier.onAvailable(controller -> {
@@ -332,6 +367,18 @@ public class TabGroupUiMediator implements BackPressHandler {
mModel.set(TabGroupUiProperties.LEFT_BUTTON_DRAWABLE_ID, drawableId);
}
+ /**
+ * Update the colors of the layer based on the specified tab.
+ * @param tab The tab to base the colors on.
@@ -296,10 +302,12 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
+ int color = mTopUiThemeColorProvider.getSceneLayerBackground(tab);
+ mModel.set(TabGroupUiProperties.PRIMARY_COLOR, color);
+ }
+ }
+
void setupLeftButtonOnClickListener(View.OnClickListener listener) {
mModel.set(TabGroupUiProperties.LEFT_BUTTON_ON_CLICK_LISTENER, listener);
}
void setupLeftButtonDrawable(int drawableId) {
@@ -437,6 +484,7 @@ public class TabGroupUiMediator implements BackPressHandler {
@@ -438,6 +485,7 @@ public class TabGroupUiMediator implements BackPressHandler {
}
public void destroy() {
@@ -397,7 +405,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -49,6 +50,9 @@ import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter;
@@ -50,6 +51,9 @@ import org.chromium.ui.modelutil.SimpleRecyclerViewAdapter;
import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
import org.chromium.ui.widget.ViewLookupCachingFrameLayout;
@@ -407,7 +415,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
@@ -99,6 +103,74 @@ public class TabListCoordinator
@@ -100,6 +104,74 @@ public class TabListCoordinator
private ItemTouchHelper mItemTouchHelper;
private OnItemTouchListener mOnItemTouchListener;
@@ -482,7 +490,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
/**
* Construct a coordinator for UI that shows a list of tabs.
* @param mode Modes of showing the list of tabs. Can be used in GRID or STRIP.
@@ -262,6 +334,12 @@ public class TabListCoordinator
@@ -249,6 +321,12 @@ public class TabListCoordinator
if (mMode == TabListMode.GRID) {
GridLayoutManager gridLayoutManager =
new GridLayoutManager(context, GRID_LAYOUT_SPAN_COUNT_COMPACT);
@@ -495,7 +503,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
mRecyclerView.setLayoutManager(gridLayoutManager);
mMediator.registerOrientationListener(gridLayoutManager);
mMediator.updateSpanCount(gridLayoutManager,
@@ -499,6 +577,9 @@ public class TabListCoordinator
@@ -488,6 +566,9 @@ public class TabListCoordinator
}
registerLayoutChangeListener();
mRecyclerView.prepareTabSwitcherView();
@@ -585,9 +593,9 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
import org.chromium.chrome.browser.incognito.reauth.IncognitoReauthManager;
+import org.chromium.chrome.browser.flags.CachedFeatureFlags;
import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
@@ -463,11 +464,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.chrome.browser.tab.TabCreationState;
@@ -457,11 +458,22 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
updateTopControlsProperties();
mContainerViewModel.set(
BOTTOM_CONTROLS_HEIGHT, browserControlsStateProvider.getBottomControlsHeight());
@@ -610,7 +618,7 @@ diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser
if (backPressManager != null && BackPressManager.isEnabled()) {
assert !mIsStartSurfaceEnabled || mIsStartSurfaceRefactorEnabled;
backPressManager.addHandler(this, BackPressHandler.Type.TAB_SWITCHER);
@@ -595,6 +607,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
@@ -589,6 +601,10 @@ class TabSwitcherMediator implements TabSwitcher.Controller, TabListRecyclerView
final int contentOffset = mBrowserControlsStateProvider.getContentOffset();
mContainerViewModel.set(TOP_MARGIN, contentOffset);
@@ -700,7 +708,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/accessibility/s
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
@@ -242,6 +242,9 @@ import java.util.ArrayList;
@@ -241,6 +241,9 @@ import java.util.ArrayList;
import java.util.List;
import java.util.function.Consumer;
@@ -710,7 +718,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
/**
* A {@link AsyncInitializationActivity} that builds and manages a {@link CompositorViewHolder}
* and associated classes.
@@ -750,6 +753,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -749,6 +752,16 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
int toolbarLayoutId = getToolbarLayoutId();
if (toolbarLayoutId != ActivityUtils.NO_RESOURCE_ID && controlContainer != null) {
controlContainer.initWithToolbar(toolbarLayoutId);
@@ -730,7 +738,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActiv
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/app/flags/ChromeCachedFlags.java
@@ -99,6 +99,7 @@ public class ChromeCachedFlags {
@@ -101,6 +101,7 @@ public class ChromeCachedFlags {
ChromeFeatureList.sInstanceSwitcher,
ChromeFeatureList.sInstantStart,
ChromeFeatureList.sInterestFeedV2,
@@ -741,7 +749,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/flags/Chrom
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/CompositorViewHolder.java
@@ -86,6 +86,8 @@ import org.chromium.ui.base.WindowAndroid;
@@ -87,6 +87,8 @@ import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.mojom.VirtualKeyboardMode;
import org.chromium.ui.resources.ResourceManager;
import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
@@ -750,7 +758,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp
import java.util.ArrayList;
import java.util.HashSet;
@@ -323,6 +325,10 @@ public class CompositorViewHolder extends FrameLayout
@@ -324,6 +326,10 @@ public class CompositorViewHolder extends FrameLayout
WebContents webContents = mTabVisible.getWebContents();
if (webContents == null) return;
EventForwarder forwarder = webContents.getEventForwarder();
@@ -761,29 +769,19 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/Comp
forwarder.setCurrentTouchEventOffsets(0, top);
}
});
@@ -940,7 +946,8 @@ public class CompositorViewHolder extends FrameLayout
// the |WebContents|.
keyboardHeight = KeyboardVisibilityDelegate.getInstance().calculateKeyboardHeight(
this.getRootView());
- h += keyboardHeight;
+ if (!ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+ h += keyboardHeight;
}
webContents.setSize(w, h - controlsHeight);
if (mVirtualKeyboardMode == VirtualKeyboardMode.OVERLAYS_CONTENT) {
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChrome.java
@@ -45,6 +45,8 @@ import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.Sc
import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.SwipeHandler;
@@ -46,6 +46,8 @@ import org.chromium.components.browser_ui.widget.gesture.SwipeGestureListener.Sw
import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator;
import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.flags.CachedFeatureFlags;
import java.util.List;
@@ -257,7 +259,10 @@ public class LayoutManagerChrome
@@ -258,7 +260,10 @@ public class LayoutManagerChrome
@Override
public SwipeHandler createToolbarSwipeHandler(boolean supportSwipeDown) {
@@ -795,7 +793,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
}
@Override
@@ -507,9 +512,11 @@ public class LayoutManagerChrome
@@ -508,9 +513,11 @@ public class LayoutManagerChrome
private static final float SWIPE_RANGE_DEG = 25;
private final boolean mSupportSwipeDown;
@@ -808,7 +806,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
}
@Override
@@ -541,6 +548,9 @@ public class LayoutManagerChrome
@@ -542,6 +549,9 @@ public class LayoutManagerChrome
&& mScrollDirection == ScrollDirection.DOWN) {
RecordUserAction.record("MobileToolbarSwipeOpenStackView");
showLayout(LayoutType.TAB_SWITCHER, true);
@@ -818,7 +816,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
} else if (mScrollDirection == ScrollDirection.LEFT
|| mScrollDirection == ScrollDirection.RIGHT) {
startShowing(mToolbarSwipeLayout, true);
@@ -587,6 +597,8 @@ public class LayoutManagerChrome
@@ -588,6 +598,8 @@ public class LayoutManagerChrome
direction = ScrollDirection.RIGHT;
} else if (swipeAngle < 270 + SWIPE_RANGE_DEG && swipeAngle > 270 - SWIPE_RANGE_DEG) {
direction = ScrollDirection.DOWN;
@@ -827,7 +825,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
}
return direction;
@@ -600,7 +612,7 @@ public class LayoutManagerChrome
@@ -601,7 +613,7 @@ public class LayoutManagerChrome
return false;
}
@@ -839,7 +837,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/compositor/layouts/LayoutManagerChromeTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromeTablet.java
@@ -27,6 +27,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer;
@@ -26,6 +26,7 @@ import org.chromium.chrome.browser.toolbar.ControlContainer;
import org.chromium.chrome.features.start_surface.StartSurface;
import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator;
import org.chromium.ui.resources.dynamics.DynamicResourceLoader;
@@ -847,7 +845,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/layo
import java.util.concurrent.Callable;
@@ -87,7 +88,8 @@ public class LayoutManagerChromeTablet extends LayoutManagerChrome {
@@ -86,7 +87,8 @@ public class LayoutManagerChromeTablet extends LayoutManagerChrome {
mStartSurfaceSupplier = startSurfaceSupplier;
mTabSwitcherSupplier = tabSwitcherSupplier;
mTabStripLayoutHelperManager = new StripLayoutHelperManager(host.getContext(), this,
@@ -899,7 +897,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/compositor/overlays/strip/StripLayoutHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelper.java
@@ -504,7 +504,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
@@ -505,7 +505,7 @@ public class StripLayoutHelper implements StripLayoutTab.StripLayoutTabDelegate
// position 0 is on the left. Account for that in the offset calculation.
boolean isRtl = LocalizationUtils.isLayoutRtl();
boolean useUnadjustedScrollOffset = isRtl != isLeft;
@@ -911,7 +909,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/overlays/strip/StripLayoutHelperManager.java
@@ -59,6 +59,9 @@ import org.chromium.ui.base.LocalizationUtils;
@@ -57,6 +57,9 @@ import org.chromium.ui.base.LocalizationUtils;
import org.chromium.ui.base.PageTransition;
import org.chromium.ui.resources.ResourceManager;
import org.chromium.url.GURL;
@@ -921,7 +919,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
import java.util.List;
@@ -132,9 +135,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -127,9 +130,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
private final String mDefaultTitle;
private final Supplier<LayerTitleCache> mLayerTitleCacheSupplier;
@@ -933,17 +931,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
public void onDown(float x, float y, boolean fromMouse, int buttons) {
+ y -= mStripFilterArea.top;
if (mModelSelectorButton.onDown(x, y)) return;
if (mStripScrim.isVisible()) return;
getActiveStripLayoutHelper().onDown(time(), x, y, fromMouse, buttons);
@@ -154,6 +161,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
}
@@ -147,12 +154,14 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@Override
public void drag(float x, float y, float dx, float dy, float tx, float ty) {
+ y -= mStripFilterArea.top;
mModelSelectorButton.drag(x, y);
if (mStripScrim.isVisible()) return;
getActiveStripLayoutHelper().drag(time(), x, y, dx, dy, tx, ty);
@@ -161,6 +169,7 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
}
@Override
public void click(float x, float y, boolean fromMouse, int buttons) {
@@ -951,23 +948,21 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
long time = time();
if (mModelSelectorButton.click(x, y)) {
mModelSelectorButton.handleClick(time);
@@ -172,13 +181,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -163,11 +172,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@Override
public void fling(float x, float y, float velocityX, float velocityY) {
- if (mStripScrim.isVisible()) return;
+ y -= mStripFilterArea.top;
getActiveStripLayoutHelper().fling(time(), x, y, velocityX, velocityY);
}
@Override
public void onLongPress(float x, float y) {
- if (mStripScrim.isVisible()) return;
+ y -= mStripFilterArea.top;
getActiveStripLayoutHelper().onLongPress(time(), x, y);
}
@@ -262,7 +271,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -229,7 +240,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
*/
public StripLayoutHelperManager(Context context, LayoutUpdateHost updateHost,
LayoutRenderHost renderHost, Supplier<LayerTitleCache> layerTitleCacheSupplier,
@@ -977,7 +972,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
mUpdateHost = updateHost;
mLayerTitleCacheSupplier = layerTitleCacheSupplier;
mTabStripTreeProvider = new TabStripSceneLayer(context);
@@ -348,6 +358,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -313,6 +325,8 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
new StripLayoutHelper(context, updateHost, renderHost, false, mModelSelectorButton);
mIncognitoHelper =
new StripLayoutHelper(context, updateHost, renderHost, true, mModelSelectorButton);
@@ -986,7 +981,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
onContextChanged(context);
}
@@ -443,9 +455,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -398,9 +412,13 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
Tab selectedTab = mTabModelSelector.getCurrentModel().getTabAt(
mTabModelSelector.getCurrentModel().index());
int selectedTabId = selectedTab == null ? TabModel.INVALID_TAB_INDEX : selectedTab.getId();
@@ -1001,7 +996,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/over
return mTabStripTreeProvider;
}
@@ -482,7 +498,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
@@ -436,7 +454,17 @@ public class StripLayoutHelperManager implements SceneOverlay, PauseResumeWithNa
mIncognitoHelper.onSizeChanged(
mWidth, mHeight, orientationChanged, LayoutManagerImpl.time());
@@ -1095,7 +1090,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scen
/**
* The Java component of what is basically a CC Layer that manages drawing the Tab Strip (which is
@@ -77,10 +79,19 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
@@ -77,9 +79,18 @@ public class TabStripSceneLayer extends SceneOverlayLayer {
*/
public void pushAndUpdateStrip(StripLayoutHelperManager layoutHelper,
LayerTitleCache layerTitleCache, ResourceManager resourceManager,
@@ -1103,7 +1098,6 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scen
+ StripLayoutTab[] stripLayoutTabsToRender, float yOffset, int selectedTabId,
+ float viewportHeight, int topControlsHeight) {
if (mNativePtr == 0) return;
- final boolean visible = yOffset > -layoutHelper.getHeight();
+ boolean visible = yOffset > -layoutHelper.getHeight();
+ if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled()) {
@@ -1238,7 +1232,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/modaldialog/Chr
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
@@ -100,6 +100,8 @@ import org.chromium.content_public.browser.NavigationEntry;
@@ -99,6 +99,8 @@ import org.chromium.content_public.browser.NavigationEntry;
import org.chromium.ui.base.DeviceFormFactor;
import org.chromium.ui.base.WindowAndroid;
import org.chromium.ui.mojom.WindowOpenDisposition;
@@ -1247,7 +1241,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
import java.util.List;
@@ -564,10 +566,15 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -562,10 +564,15 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
// + topControlsDistanceToRest| will give the margin for the current animation frame.
final int topControlsDistanceToRest = mBrowserControlsStateProvider.getContentOffset()
- mBrowserControlsStateProvider.getTopControlsHeight();
@@ -1265,7 +1259,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
if (topMargin != layoutParams.topMargin || bottomMargin != layoutParams.bottomMargin) {
layoutParams.topMargin = topMargin;
@@ -587,7 +594,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -585,7 +592,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
* strip.
*/
private int getToolbarExtraYOffset() {
@@ -1345,7 +1339,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/RecentTabsP
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
@@ -77,6 +77,11 @@ import org.chromium.ui.base.WindowDelegate;
@@ -80,6 +80,11 @@ import org.chromium.ui.base.WindowDelegate;
import org.chromium.ui.modaldialog.ModalDialogManager;
import org.chromium.url.GURL;
@@ -1357,7 +1351,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
import java.lang.ref.WeakReference;
/** Queries the user's default search engine and shows autocomplete suggestions. */
@@ -190,6 +195,12 @@ public class SearchActivity extends AsyncInitializationActivity
@@ -206,6 +211,12 @@ public class SearchActivity extends AsyncInitializationActivity
mSearchBox = (SearchActivityLocationBarLayout) mContentView.findViewById(
R.id.search_location_bar);
mAnchorView = mContentView.findViewById(R.id.toolbar);
@@ -1370,7 +1364,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
updateAnchorViewLayout();
// Create status bar color controller and assign to search activity.
@@ -215,7 +226,7 @@ public class SearchActivity extends AsyncInitializationActivity
@@ -231,7 +242,7 @@ public class SearchActivity extends AsyncInitializationActivity
getOnBackPressedDispatcher().addCallback(this, backPressManager.getCallback());
}
// clang-format off
@@ -1382,10 +1376,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsActivity.java
@@ -320,6 +320,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
@@ -310,7 +310,11 @@ public class SettingsActivity extends ChromeBaseAppCompatActivity
if (fragment instanceof INeedSnackbarManager) {
((INeedSnackbarManager)fragment).setSnackbarManager(mSnackbarManager);
}
- initBackPressHandler();
+ if (fragment instanceof AccessibilitySettings) {
+ ((ChromeAccessibilitySettingsDelegate)
+ ((AccessibilitySettings) fragment)
@@ -1448,7 +1443,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/status_indicato
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -174,6 +174,9 @@ import org.chromium.url.GURL;
@@ -173,6 +173,9 @@ import org.chromium.url.GURL;
import java.util.List;
@@ -1458,7 +1453,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
/**
* Contains logic for managing the toolbar visual component. This class manages the interactions
* with the rest of the application to ensure the toolbar is always visually up to date.
@@ -648,7 +651,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -643,7 +646,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
mEphemeralTabCoordinatorSupplier);
// clang-format off
LocationBarCoordinator locationBarCoordinator = new LocationBarCoordinator(
@@ -1467,7 +1462,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
PrivacyPreferencesManagerImpl.getInstance(), mLocationBarModel,
mActionModeController.getActionModeCallback(),
new WindowDelegate(mActivity.getWindow()), windowAndroid, mActivityTabProvider,
@@ -883,11 +886,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -877,11 +880,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
// the height won't be measured by the background image.
if (mControlContainer.getBackground() == null) {
setControlContainerTopMargin(getToolbarExtraYOffset());
@@ -1481,8 +1476,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mControlContainer.removeOnLayoutChangeListener(mLayoutChangeListener);
mLayoutChangeListener = null;
}
@@ -1279,13 +1284,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return mLocationBar.getOmniboxStub().isUrlBarFocused();
@@ -1289,13 +1294,25 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return ((LocationBarCoordinator) mLocationBar).getUrlBarTextWithoutAutocomplete();
}
+ View mBottomRoot;
@@ -1509,8 +1504,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mScrimCoordinator, mOmniboxFocusStateSupplier, mBottomSheetController,
mActivityLifecycleDispatcher, mIsWarmOnResumeSupplier, mTabModelSelector,
mTabContentManager, mCompositorViewHolder,
@@ -1293,8 +1310,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
mShareDelegateSupplier, mLayoutStateProviderSupplier, mSnackbarManager);
@@ -1303,8 +1320,9 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
mLayoutStateProviderSupplier, mSnackbarManager);
var bottomControlsCoordinator = new BottomControlsCoordinator(mActivity, mWindowAndroid,
mLayoutManager, mCompositorViewHolder.getResourceManager(), mBrowserControlsSizer,
- mFullscreenManager, (ScrollingBottomViewResourceFrameLayout) root, mTabGroupUi,
@@ -1521,7 +1516,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
mBottomControlsCoordinatorSupplier.set(bottomControlsCoordinator);
bottomControlsCoordinator.getHandleBackPressChangedSupplier().addObserver(
(x) -> { onBackPressStateChanged(); });
@@ -2079,6 +2097,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -2102,6 +2120,15 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
private void setControlContainerTopMargin(int margin) {
final ViewGroup.MarginLayoutParams layoutParams =
((ViewGroup.MarginLayoutParams) mControlContainer.getLayoutParams());
@@ -1541,15 +1536,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContai
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContainer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContainer.java
@@ -15,6 +15,8 @@ import org.chromium.base.lifetime.Destroyable;
import org.chromium.base.supplier.ObservableSupplier;
import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider;
import org.chromium.ui.base.ApplicationViewportInsetSupplier;
import org.chromium.ui.base.ViewportInsets;
+import org.chromium.chrome.browser.flags.ChromeFeatureList;
+import org.chromium.chrome.browser.flags.CachedFeatureFlags;
/**
* The container that holds both infobars and snackbars. It will be translated up and down when the
@@ -62,10 +64,27 @@ public class BottomContainer
@@ -57,10 +59,27 @@ public class BottomContainer
setTranslationY(mBaseYOffset);
}
@@ -1576,7 +1571,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/BottomContai
+ }
float offsetFromControls = mBrowserControlsStateProvider.getBottomControlOffset()
- mBrowserControlsStateProvider.getBottomControlsHeight();
offsetFromControls -= mViewportInsetSupplier.get();
offsetFromControls -= mViewportInsetSupplier.get().viewVisibleHeightInset;
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/system/StatusBarColorController.java
@@ -1611,7 +1606,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/system/Statu
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
@@ -7084,6 +7084,11 @@ const FeatureEntry kFeatureEntries[] = {
@@ -7385,6 +7385,11 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kWindowsScrollingPersonalityDescription, kOsAll,
FEATURE_VALUE_TYPE(features::kWindowsScrollingPersonality)},
@@ -1634,7 +1629,7 @@ diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer
using base::android::JavaParamRef;
using base::android::JavaRef;
@@ -96,8 +97,10 @@ void TabStripSceneLayer::SetContentTree(
@@ -93,8 +94,10 @@ void TabStripSceneLayer::SetContentTree(
content_tree_ = content_tree;
if (content_tree) {
layer()->InsertChild(content_tree->layer(), 0);
@@ -1647,7 +1642,7 @@ diff --git a/chrome/browser/android/compositor/scene_layer/tab_strip_scene_layer
}
}
}
@@ -130,13 +133,18 @@ void TabStripSceneLayer::UpdateTabStripLayer(JNIEnv* env,
@@ -127,13 +130,18 @@ void TabStripSceneLayer::UpdateTabStripLayer(JNIEnv* env,
jboolean should_readd_background,
jint background_color) {
gfx::RectF content(0, y_offset, width, height);
@@ -1710,7 +1705,7 @@ diff --git a/chrome/browser/browser_controls/android/java/src/org/chromium/chrom
diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descriptions.cc
--- a/chrome/browser/flag_descriptions.cc
+++ b/chrome/browser/flag_descriptions.cc
@@ -1817,6 +1817,10 @@ const char kImprovedKeyboardShortcutsDescription[] =
@@ -1808,6 +1808,10 @@ const char kImprovedKeyboardShortcutsDescription[] =
"Ensure keyboard shortcuts work consistently with international keyboard "
"layouts and deprecate legacy shortcuts.";
@@ -1724,9 +1719,9 @@ diff --git a/chrome/browser/flag_descriptions.cc b/chrome/browser/flag_descripti
diff --git a/chrome/browser/flag_descriptions.h b/chrome/browser/flag_descriptions.h
--- a/chrome/browser/flag_descriptions.h
+++ b/chrome/browser/flag_descriptions.h
@@ -1016,6 +1016,9 @@ extern const char kImprovedKeyboardShortcutsDescription[];
extern const char kCompositorThreadedScrollbarScrollingName[];
extern const char kCompositorThreadedScrollbarScrollingDescription[];
@@ -1015,6 +1015,9 @@ extern const char kIgnoreSyncEncryptionKeysLongMissingDescription[];
extern const char kImprovedKeyboardShortcutsName[];
extern const char kImprovedKeyboardShortcutsDescription[];
+extern const char kMoveTopToolbarToBottomName[];
+extern const char kMoveTopToolbarToBottomDescription[];
@@ -1777,7 +1772,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
#include "base/metrics/field_trial_params.h"
#include "base/no_destructor.h"
#include "base/strings/string_piece_forward.h"
@@ -239,6 +240,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -245,6 +246,7 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kInstantStart,
&kLensCameraAssistedSearch,
&kLensOnQuickActionSearchWidget,
@@ -1823,7 +1818,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java
@@ -375,6 +375,8 @@ public abstract class ChromeFeatureList {
@@ -385,6 +385,8 @@ public abstract class ChromeFeatureList {
public static final String METRICS_SETTINGS_ANDROID = "MetricsSettingsAndroid";
public static final String SEARCH_READY_OMNIBOX = "SearchReadyOmnibox";
public static final String MODAL_PERMISSION_DIALOG_VIEW = "ModalPermissionDialogView";
@@ -1832,15 +1827,15 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f
public static final String NOTIFICATION_PERMISSION_VARIANT = "NotificationPermissionVariant";
public static final String NOTIFICATION_PERMISSION_BOTTOM_SHEET =
"NotificationPermissionBottomSheet";
@@ -633,6 +635,8 @@ public abstract class ChromeFeatureList {
@@ -652,6 +654,8 @@ public abstract class ChromeFeatureList {
public static final CachedFlag sInterestFeedV2 = new CachedFlag(INTEREST_FEED_V2, true);
public static final CachedFlag sLensCameraAssistedSearch =
new CachedFlag(LENS_CAMERA_ASSISTED_SEARCH, true);
+ public static final CachedFlag sMoveTopToolbarToBottom =
+ new CachedFlag(MOVE_TOP_TOOLBAR_TO_BOTTOM, false);
public static final CachedFlag sOSKResizesVisualViewportByDefault =
new CachedFlag(OSK_RESIZES_VISUAL_VIEWPORT, false);
public static final CachedFlag sOmahaMinSdkVersionAndroid =
new CachedFlag(OMAHA_MIN_SDK_VERSION_ANDROID, false);
public static final CachedFlag sOmniboxMatchToolbarAndStatusBarColor =
diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
--- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
+++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java
@@ -1948,7 +1943,7 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/ch
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
@@ -90,6 +90,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -90,6 +90,7 @@ public class LocationBarCoordinator
private WindowDelegate mWindowDelegate;
private WindowAndroid mWindowAndroid;
private View mAutocompleteAnchorView;
@@ -1956,7 +1951,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
private LocationBarMediator mLocationBarMediator;
private View mUrlBar;
private View mDeleteButton;
@@ -145,7 +146,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -144,7 +145,7 @@ public class LocationBarCoordinator
* @param reportExceptionCallback A {@link Callback} to report exceptions.
* @param backPressManager The {@link BackPressManager} for intercepting back press.
*/
@@ -1965,7 +1960,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
ObservableSupplier<Profile> profileObservableSupplier,
PrivacyPreferencesManager privacyPreferencesManager,
LocationBarDataProvider locationBarDataProvider, ActionMode.Callback actionModeCallback,
@@ -177,6 +178,7 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -175,6 +176,7 @@ public class LocationBarCoordinator
mActivityLifecycleDispatcher = activityLifecycleDispatcher;
mActivityLifecycleDispatcher.register(this);
mAutocompleteAnchorView = autocompleteAnchorView;
@@ -1973,8 +1968,8 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
Context context = mLocationBarLayout.getContext();
OneshotSupplierImpl<TemplateUrlService> templateUrlServiceSupplier =
new OneshotSupplierImpl<>();
@@ -407,6 +409,11 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
return mAutocompleteAnchorView;
@@ -371,6 +373,11 @@ public class LocationBarCoordinator
mLocationBarMediator.revertChanges();
}
+ @Override
@@ -1983,8 +1978,8 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
+ }
+
@Override
public View getAlignmentView() {
return isTablet() ? mLocationBarLayout : mAutocompleteAnchorView;
public View getContainerView() {
return mLocationBarLayout;
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/UrlBarCoordinator.java
@@ -2016,7 +2011,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/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
@@ -61,6 +61,8 @@ import org.chromium.ui.modelutil.LazyConstructionPropertyMcp;
@@ -59,6 +59,8 @@ import org.chromium.ui.modelutil.LazyConstructionPropertyMcp;
import org.chromium.ui.modelutil.MVCListAdapter;
import org.chromium.ui.modelutil.MVCListAdapter.ModelList;
import org.chromium.ui.modelutil.PropertyModel;
@@ -2025,7 +2020,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import java.util.ArrayList;
import java.util.List;
@@ -77,6 +79,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
@@ -75,6 +77,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
private @Nullable OmniboxSuggestionsDropdown mDropdown;
private @NonNull ObserverList<OmniboxSuggestionsDropdownScrollListener> mScrollListenerList =
new ObserverList<>();
@@ -2033,7 +2028,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
public AutocompleteCoordinator(@NonNull ViewGroup parent,
@NonNull AutocompleteControllerProvider controllerProvider,
@@ -100,6 +103,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
@@ -98,6 +101,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
PropertyModel listModel = new PropertyModel(SuggestionListProperties.ALL_KEYS);
ModelList listItems = new ModelList();
@@ -2041,7 +2036,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
listModel.set(SuggestionListProperties.EMBEDDER, dropdownEmbedder);
listModel.set(SuggestionListProperties.VISIBLE, false);
listModel.set(SuggestionListProperties.SUGGESTION_MODELS, listItems);
@@ -156,7 +160,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
@@ -154,7 +158,7 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
public void inflate() {
OmniboxSuggestionsDropdown dropdown;
try (StrictModeContext ignored = StrictModeContext.allowDiskReads()) {
@@ -2050,7 +2045,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
}
// Start with visibility GONE to ensure that show() is called.
@@ -234,6 +238,16 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
@@ -232,6 +236,16 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
ViewGroup container = (ViewGroup) ((ViewStub) mParent.getRootView().findViewById(
R.id.omnibox_results_container_stub))
.inflate();
@@ -2080,7 +2075,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
@@ -1012,7 +1015,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
@@ -1029,7 +1032,9 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
@Override
public void onSuggestionDropdownScroll() {
mSuggestionsListScrolled = true;
@@ -2141,7 +2136,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/suggestions/OmniboxSuggestionsDropdown.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdown.java
@@ -43,6 +43,9 @@ import org.chromium.ui.base.ViewUtils;
@@ -41,6 +41,9 @@ import org.chromium.ui.base.ViewUtils;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -2151,7 +2146,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/** A widget for showing a list of omnibox suggestions. */
public class OmniboxSuggestionsDropdown extends RecyclerView {
private static final long DEFERRED_INITIAL_SHRINKING_LAYOUT_FROM_IME_DURATION_MS = 300;
@@ -246,7 +249,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
@@ -248,7 +251,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
* Constructs a new list designed for containing omnibox suggestions.
* @param context Context used for contained views.
*/
@@ -2161,7 +2156,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
super(context, null, android.R.attr.dropDownListViewStyle);
setFocusable(true);
setFocusableInTouchMode(true);
@@ -256,13 +260,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
@@ -258,13 +262,25 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
setItemAnimator(null);
mLayoutScrollListener = new SuggestionLayoutScrollListener(context);
@@ -2188,33 +2183,33 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
ViewCompat.setPaddingRelative(this, 0, 0, 0, paddingBottom);
mStandardBgColor = shouldShowModernizeVisualUpdate
@@ -484,6 +500,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
@@ -491,6 +507,8 @@ public class OmniboxSuggestionsDropdown extends RecyclerView {
}
private int calculateAnchorBottomRelativeToContent() {
private int calculateAvailableViewportHeight() {
+ if (ChromeFeatureList.sMoveTopToolbarToBottom.isEnabled())
+ return 0;
View contentView =
mEmbedder.getAnchorView().getRootView().findViewById(android.R.id.content);
ViewUtils.getRelativeLayoutPosition(contentView, mAnchorView, mTempPosition);
mEmbedder.getWindowDelegate().getWindowVisibleDisplayFrame(mTempRect);
return mTempRect.height();
}
diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdownEmbedder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdownEmbedder.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdownEmbedder.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestionsDropdownEmbedder.java
@@ -16,6 +16,10 @@ public interface OmniboxSuggestionsDropdownEmbedder {
@@ -94,6 +94,10 @@ public interface OmniboxSuggestionsDropdownEmbedder {
@NonNull
View getAnchorView();
OmniboxAlignment getCurrentAlignment();
+ /** Return the container view the suggestion list should be drawn in. */
+ @NonNull
+ View getAnchorContainerView();
+
/**
* Return the view that the omnibox suggestions should be aligned horizontally to. The
* view must be a descendant of {@link #getAnchorView()} or the anchor view itself.
/** Return the delegate used to interact with the Window. */
@NonNull
WindowDelegate getWindowDelegate();
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -1623,6 +1623,12 @@ Your Google account may have other forms of browsing history like searches and a
@@ -1626,6 +1626,12 @@ Your Google account may have other forms of browsing history like searches and a
<message name="IDS_FORCE_TABLET_UI_TITLE" desc="Title of the preference that allows the user to update force tablet UI settings.">
Force Tablet Mode
</message>
@@ -2230,7 +2225,7 @@ diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chro
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
@@ -171,6 +171,7 @@ android_library("java") {
@@ -173,6 +173,7 @@ android_library("java") {
"//components/user_prefs/android:java",
"//content/public/android:content_java",
"//third_party/android_deps:material_design_java",
@@ -2454,7 +2449,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
+++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarControlContainer.java
@@ -57,6 +57,11 @@ import java.lang.annotation.Retention;
@@ -60,6 +60,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.function.BooleanSupplier;
@@ -2466,7 +2461,7 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/brow
/**
* Layout for the browser controls (omnibox, menu, tab strip, etc..).
*/
@@ -113,6 +118,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@@ -116,6 +121,12 @@ public class ToolbarControlContainer extends OptimizedFrameLayout implements Con
@Override
public void initWithToolbar(int toolbarLayoutId) {
try (TraceEvent te = TraceEvent.scoped("ToolbarControlContainer.initWithToolbar")) {
@@ -2664,7 +2659,7 @@ diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/
#include "cc/base/math_util.h"
#include "cc/slim/layer.h"
#include "components/viz/common/features.h"
@@ -841,6 +842,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(
@@ -854,6 +855,8 @@ void RenderWidgetHostViewAndroid::OnRenderFrameMetadataChangedBeforeActivation(
// factor. Thus, |top_content_offset| in CSS pixels is also in DIPs.
float top_content_offset =
metadata.top_controls_height * metadata.top_controls_shown_ratio;
build/patches/Remove-binary-blob-integrations.patch
+53 -55
View File
@@ -26,7 +26,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
...em_webview_bundle.AndroidManifest.expected | 5 -
chrome/android/BUILD.gn | 47 +-
chrome/android/chrome_java_sources.gni | 6 -
chrome/android/chrome_java_sources.gni | 5 -
.../features/cablev2_authenticator/BUILD.gn | 2 -
chrome/android/java/AndroidManifest.xml | 51 --
.../java/res/xml/privacy_preferences.xml | 5 -
@@ -90,7 +90,7 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
components/signin/public/android/BUILD.gn | 3 -
.../signin/AccountRenameChecker.java | 16 -
components/webauthn/android/BUILD.gn | 9 -
.../webauthn/AuthenticatorImpl.java | 85 +--
.../webauthn/AuthenticatorImpl.java | 83 +--
.../webauthn/Fido2ApiCallHelper.java | 23 +-
.../push_messaging/push_messaging_manager.cc | 2 +-
content/public/android/BUILD.gn | 4 -
@@ -101,11 +101,11 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
services/BUILD.gn | 9 -
services/device/geolocation/BUILD.gn | 4 -
services/shape_detection/BUILD.gn | 2 -
third_party/android_deps/BUILD.gn | 567 +-----------------
third_party/android_deps/BUILD.gn | 568 +-----------------
.../preconditions/javatests/BUILD.gn | 1 -
.../gms/ChromiumPlayServicesAvailability.java | 10 +-
weblayer/browser/java/BUILD.gn | 1 -
81 files changed, 96 insertions(+), 1963 deletions(-)
81 files changed, 96 insertions(+), 1961 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
@@ -132,7 +132,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
@@ -242,14 +242,6 @@ if (current_toolchain == default_toolchain) {
@@ -230,14 +230,6 @@ if (current_toolchain == default_toolchain) {
":chrome_public_apk_template_resources",
":update_proto_java",
":usage_stats_proto_java",
@@ -146,8 +146,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
- "$google_play_services_package:google_play_services_tasks_java",
"//base:jni_java",
"//cc:cc_java",
"//chrome/android/features/keyboard_accessory:public_java",
@@ -536,14 +528,23 @@ if (current_toolchain == default_toolchain) {
"//cc/mojom:mojom_java",
@@ -529,14 +521,23 @@ if (current_toolchain == default_toolchain) {
"//services/shape_detection:shape_detection_java",
"//services/shape_detection/public/mojom:mojom_java",
"//skia/public/mojom:mojom_java",
@@ -174,7 +174,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//third_party/android_deps:protobuf_lite_runtime_java",
"//third_party/android_media:android_media_java",
"//third_party/android_swipe_refresh:android_swipe_refresh_java",
@@ -832,11 +833,6 @@ if (current_toolchain == default_toolchain) {
@@ -817,11 +818,6 @@ if (current_toolchain == default_toolchain) {
":chrome_java",
":chrome_jni_headers",
":delegate_public_impl_java",
@@ -186,7 +186,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",
@@ -1383,13 +1379,6 @@ if (current_toolchain == default_toolchain) {
@@ -1375,13 +1371,6 @@ if (current_toolchain == default_toolchain) {
":chrome_app_java_resources",
":chrome_test_util_java",
":delegate_public_impl_java",
@@ -200,7 +200,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:jni_java",
@@ -2318,7 +2307,6 @@ if (current_toolchain == default_toolchain) {
@@ -2310,7 +2299,6 @@ if (current_toolchain == default_toolchain) {
]
deps = [
":chrome_java",
@@ -208,7 +208,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//base:base_java",
"//base:base_java_test_support",
"//base:jni_java",
@@ -2455,7 +2443,6 @@ if (current_toolchain == default_toolchain) {
@@ -2447,7 +2435,6 @@ if (current_toolchain == default_toolchain) {
# is in a DFM.
android_library("base_module_java") {
sources = [
@@ -216,7 +216,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",
@@ -2471,8 +2458,6 @@ if (current_toolchain == default_toolchain) {
@@ -2463,8 +2450,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",
@@ -225,7 +225,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",
@@ -2497,17 +2482,11 @@ if (current_toolchain == default_toolchain) {
@@ -2489,17 +2474,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",
@@ -243,7 +243,7 @@ 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",
@@ -2521,7 +2500,6 @@ if (current_toolchain == default_toolchain) {
@@ -2513,7 +2492,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",
@@ -251,7 +251,7 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
"//third_party/androidx:androidx_annotation_annotation_java",
"//third_party/androidx:androidx_collection_collection_java",
"//ui/android:ui_no_recycler_view_java",
@@ -2540,7 +2518,6 @@ if (current_toolchain == default_toolchain) {
@@ -2532,7 +2510,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.
@@ -270,11 +270,10 @@ 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",
@@ -932,11 +931,6 @@ chrome_java_sources = [
@@ -933,10 +932,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",
@@ -297,7 +296,7 @@ diff --git a/chrome/android/features/cablev2_authenticator/BUILD.gn b/chrome/and
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -106,21 +106,16 @@ by a child template that "extends" this file.
@@ -111,21 +111,16 @@ by a child template that "extends" this file.
<permission android:name="{{ manifest_package }}.permission.CHILD_SERVICE" android:protectionLevel="signature" />
<permission android:name="{{ manifest_package }}.permission.READ_WRITE_BOOKMARK_FOLDERS" android:protectionLevel="signatureOrSystem" />
<permission android:name="{{ manifest_package }}.TOS_ACKED" android:protectionLevel="signatureOrSystem" />
@@ -319,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 %}
@@ -758,16 +753,6 @@ by a child template that "extends" this file.
@@ -780,16 +775,6 @@ by a child template that "extends" this file.
</intent-filter>
</activity>
@@ -336,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"
@@ -959,26 +944,6 @@ by a child template that "extends" this file.
@@ -981,26 +966,6 @@ by a child template that "extends" this file.
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize"
android:hardwareAccelerated="false" />
@@ -363,7 +362,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"/>
@@ -1009,20 +974,10 @@ by a child template that "extends" this file.
@@ -1031,20 +996,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 +383,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" />
@@ -1254,12 +1209,6 @@ by a child template that "extends" this file.
@@ -1276,12 +1231,6 @@ by a child template that "extends" this file.
{% endif %}
@@ -754,15 +753,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omaha/UpdateSta
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java
@@ -120,7 +120,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -122,7 +122,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
private Preference mLinkPref;
private Menu mMenu;
- private @Nullable PasswordCheck mPasswordCheck;
private @ManagePasswordsReferrer int mManagePasswordsReferrer;
private HelpAndFeedbackLauncher mHelpAndFeedbackLauncher;
/**
@@ -182,7 +181,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -185,7 +184,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -770,7 +769,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
computeTrustedVaultBannerState();
}
@@ -287,9 +285,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -289,9 +287,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
createSavePasswordsSwitch();
createAutoSignInCheckbox();
@@ -780,7 +779,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
if (mTrustedVaultBannerState == TrustedVaultBannerState.OPTED_IN) {
createTrustedVaultBanner(R.string.android_trusted_vault_banner_sub_label_opted_in,
@@ -464,10 +459,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
@@ -466,10 +461,6 @@ public class PasswordSettings extends PreferenceFragmentCompat
// by the system.
if (getActivity().isFinishing()) {
PasswordManagerHandlerProvider.getInstance().removeObserver(this);
@@ -814,7 +813,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
@@ -7062,8 +7062,6 @@ static_library("browser") {
@@ -7051,8 +7051,6 @@ static_library("browser") {
"offline_pages/offliner_helper.h",
"offline_pages/offliner_user_data.cc",
"offline_pages/offliner_user_data.h",
@@ -1097,7 +1096,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
@@ -253,8 +253,6 @@ static_library("ui") {
@@ -255,8 +255,6 @@ static_library("ui") {
"webui/flags/flags_ui.h",
"webui/flags/flags_ui_handler.cc",
"webui/flags/flags_ui_handler.h",
@@ -1106,7 +1105,7 @@ 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",
@@ -489,7 +487,6 @@ static_library("ui") {
@@ -491,7 +489,6 @@ static_library("ui") {
"//components/feedback/redaction_tool",
"//components/find_in_page",
"//components/flags_ui",
@@ -1117,7 +1116,7 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java
--- a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java
+++ b/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/browser/ui/signin/fre/SigninFirstRunMediator.java
@@ -186,12 +186,8 @@ public class SigninFirstRunMediator
@@ -183,12 +183,8 @@ public class SigninFirstRunMediator
boolean isSigninDisabledByPolicy = false;
boolean isMetricsReportingDisabledByPolicy = false;
if (hasPolicies) {
@@ -1135,7 +1134,7 @@ diff --git a/chrome/browser/ui/android/signin/java/src/org/chromium/chrome/brows
diff --git a/chrome/browser/ui/webauthn/sheet_models.cc b/chrome/browser/ui/webauthn/sheet_models.cc
--- a/chrome/browser/ui/webauthn/sheet_models.cc
+++ b/chrome/browser/ui/webauthn/sheet_models.cc
@@ -186,12 +186,7 @@ bool AuthenticatorMechanismSelectorSheetModel::IsManageDevicesButtonVisible()
@@ -191,12 +191,7 @@ bool AuthenticatorMechanismSelectorSheetModel::IsManageDevicesButtonVisible()
const {
// If any phones are shown then also show a button that goes to the settings
// page to manage them.
@@ -1160,7 +1159,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"
@@ -803,8 +802,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
@@ -814,8 +813,6 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
return &NewWebUI<FlagsDeprecatedUI>;
if (url.host_piece() == chrome::kChromeUIFlagsHost)
return &NewWebUI<FlagsUI>;
@@ -1172,7 +1171,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
@@ -1111,10 +1111,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms(
@@ -1137,10 +1137,6 @@ void AuthenticatorRequestDialogModel::PopulateMechanisms(
if (cable_ui_type_) {
switch (*cable_ui_type_) {
case AuthenticatorRequestDialogModel::CableUIType::CABLE_V2_2ND_FACTOR:
@@ -1199,7 +1198,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
@@ -254,8 +254,6 @@ android_library("chrome_java_integration_test_support") {
@@ -247,8 +247,6 @@ android_library("chrome_java_integration_test_support") {
deps = [
":chrome_java_test_support_common",
@@ -1261,8 +1260,8 @@ diff --git a/components/externalauth/android/java/src/org/chromium/components/ex
import org.chromium.base.StrictModeContext;
@@ -25,7 +22,6 @@ import org.chromium.base.TraceEvent;
import org.chromium.base.task.PostTask;
import org.chromium.base.task.TaskTraits;
import org.chromium.components.embedder_support.util.Origin;
import org.chromium.content_public.browser.UiThreadTaskTraits;
-import org.chromium.gms.ChromiumPlayServicesAvailability;
/**
@@ -2982,7 +2981,7 @@ diff --git a/components/module_installer/android/BUILD.gn b/components/module_in
"//third_party/androidx:androidx_annotation_annotation_java",
]
@@ -59,11 +57,9 @@ robolectric_binary("module_installer_junit_tests") {
@@ -58,11 +56,9 @@ robolectric_binary("module_installer_junit_tests") {
]
deps = [
":module_installer_java",
@@ -3205,7 +3204,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
}
/**
@@ -209,34 +166,13 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -209,32 +166,13 @@ public final class AuthenticatorImpl implements Authenticator {
*/
public void getMatchingCredentialIds(String relyingPartyId, byte[][] credentialIds,
boolean requireThirdPartyPayment, GetMatchingCredentialIdsResponseCallback callback) {
@@ -3229,11 +3228,9 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
- return;
- }
-
- // The WebAuthenticationConditionalUI feature will only be enabled on Android when gmscore
- // supports silent discovery. If the gmscore and chromium versions are out of sync for some
- // reason, this method will return true but chrome will ignore conditional requests.
- // Android surfaces only platform credentials on conditional requests, use IsUVPAA as a
- // proxy for availability.
- // If the gmscore and chromium versions are out of sync for some reason, this method will
- // return true but chrome will ignore conditional requests. Android surfaces only platform
- // credentials on conditional requests, use IsUVPAA as a proxy for availability.
- mIsUserVerifyingPlatformAuthenticatorAvailableCallbackQueue.add(callback);
- getFido2CredentialRequest().handleIsUserVerifyingPlatformAuthenticatorAvailableRequest(
- mRenderFrameHost,
@@ -3242,7 +3239,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
}
@Override
@@ -248,8 +184,6 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -246,8 +184,6 @@ public final class AuthenticatorImpl implements Authenticator {
if (!mIsOperationPending || mGetAssertionCallback == null) {
return;
}
@@ -3251,7 +3248,7 @@ diff --git a/components/webauthn/android/java/src/org/chromium/components/webaut
}
/**
@@ -299,7 +233,6 @@ public final class AuthenticatorImpl implements Authenticator {
@@ -297,7 +233,6 @@ public final class AuthenticatorImpl implements Authenticator {
mIsOperationPending = false;
mMakeCredentialCallback = null;
mGetAssertionCallback = null;
@@ -3312,7 +3309,7 @@ diff --git a/content/browser/push_messaging/push_messaging_manager.cc b/content/
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -132,10 +132,6 @@ android_library("content_main_dex_java") {
@@ -129,10 +129,6 @@ android_library("content_main_dex_java") {
android_library("content_full_java") {
deps = [
":content_main_dex_java",
@@ -3326,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
@@ -3236,10 +3236,6 @@ if (is_android) {
@@ -3271,10 +3271,6 @@ if (is_android) {
testonly = true
sources = content_java_sources_needing_jni
deps = [
@@ -3340,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
@@ -476,9 +476,6 @@ if (is_android) {
@@ -489,9 +489,6 @@ if (is_android) {
"gamepad/android/junit/src/org/chromium/device/gamepad/GamepadMappingsTest.java",
]
deps = [
@@ -3387,7 +3384,7 @@ diff --git a/remoting/android/client_java_tmpl.gni b/remoting/android/client_jav
diff --git a/services/BUILD.gn b/services/BUILD.gn
--- a/services/BUILD.gn
+++ b/services/BUILD.gn
@@ -117,11 +117,6 @@ if (is_android) {
@@ -123,11 +123,6 @@ if (is_android) {
"shape_detection/android/junit/src/org/chromium/shape_detection/BitmapUtilsTest.java",
]
deps = [
@@ -3399,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",
@@ -150,10 +145,6 @@ if (is_android) {
@@ -156,10 +151,6 @@ if (is_android) {
"shape_detection/android/javatests/src/org/chromium/shape_detection/TextDetectionImplTest.java",
]
deps = [
@@ -3439,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
@@ -75,21 +75,13 @@ if (!limit_android_deps) {
@@ -81,22 +81,13 @@ if (!limit_android_deps) {
android_library("chromium_play_services_availability_java") {
sources = [ "util/org/chromium/gms/ChromiumPlayServicesAvailability.java" ]
@@ -3453,6 +3450,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
}
-
- java_group("playcore_java") {
- preferred_dep = true
- if (defined(playcore_target)) {
- deps = [ playcore_target ]
- } else {
@@ -3462,7 +3460,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
}
# TODO(crbug.com/1366370) Remove this once all depencencies are updated to
@@ -954,210 +946,6 @@ if (!limit_android_deps) {
@@ -961,210 +952,6 @@ if (!limit_android_deps) {
]
}
@@ -3673,7 +3671,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
android_aar_prebuilt("com_google_android_material_material_java") {
aar_path =
@@ -1203,64 +991,6 @@ if (!limit_android_deps) {
@@ -1210,64 +997,6 @@ if (!limit_android_deps) {
]
}
@@ -3738,7 +3736,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 +1249,6 @@ if (!limit_android_deps) {
@@ -1571,19 +1300,6 @@ if (!limit_android_deps) {
is_robolectric = true
}
@@ -3758,7 +3756,7 @@ diff --git a/third_party/android_deps/BUILD.gn b/third_party/android_deps/BUILD.
# This is generated, do not edit. Update BuildConfigGenerator.groovy instead.
java_prebuilt("org_robolectric_utils_java") {
jar_path = "libs/org_robolectric_utils/utils-4.8.1.jar"
@@ -1892,288 +1609,6 @@ if (!limit_android_deps) {
@@ -1944,288 +1660,6 @@ if (!limit_android_deps) {
deps = [ "//third_party/androidx:androidx_annotation_annotation_java" ]
}
build/patches/Remove-contextual-search-manager.patch
+66 -66
View File
@@ -53,15 +53,15 @@ 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
@@ -596,7 +596,6 @@ if (current_toolchain == default_toolchain) {
@@ -586,7 +586,6 @@ if (current_toolchain == default_toolchain) {
"//chrome/browser:sharing_send_message_result_generated_enum",
"//chrome/browser/notifications/scheduler/public:jni_enums",
"//chrome/browser/ui:duplicate_download_enums_java",
"//components/browsing_data/core:browsing_data_utils_java",
"//components/browsing_data/core:clear_browsing_data_tab_java",
- "//components/contextual_search/core/browser:quick_action_category_enum_javagen",
"//components/dom_distiller/core:distiller_type_java",
"//components/ntp_tiles:ntp_tiles_enums_java",
"//components/offline_pages/core:offline_page_model_enums_java",
@@ -3492,16 +3491,12 @@ generate_jni("chrome_jni_headers") {
@@ -3480,16 +3479,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
@@ -489,13 +489,6 @@ chrome_java_resources = [
@@ -490,13 +490,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,8 +95,8 @@ 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",
@@ -639,7 +632,6 @@ chrome_java_resources = [
"java/res/xml/autofill_assistant_preferences.xml",
@@ -637,7 +630,6 @@ chrome_java_resources = [
"java/res/xml/account_management_preferences_legacy.xml",
"java/res/xml/bookmark_widget_info.xml",
"java/res/xml/clear_browsing_data_preferences_tab.xml",
- "java/res/xml/contextual_search_preferences.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
@@ -305,21 +305,6 @@ chrome_java_sources = [
@@ -310,21 +310,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",
@@ -361,7 +346,6 @@ chrome_java_sources = [
@@ -365,7 +350,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",
@@ -387,34 +371,6 @@ chrome_java_sources = [
@@ -391,34 +375,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",
@@ -174,7 +174,7 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java
diff --git a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java
--- a/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java
+++ b/chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/ManualFillingMediator.java
@@ -35,7 +35,6 @@ import org.chromium.base.supplier.Supplier;
@@ -38,7 +38,6 @@ import org.chromium.base.supplier.Supplier;
import org.chromium.chrome.browser.app.ChromeActivity;
import org.chromium.chrome.browser.back_press.BackPressManager;
import org.chromium.chrome.browser.compositor.CompositorViewHolder;
@@ -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;
@@ -537,14 +536,6 @@ class ManualFillingMediator
@@ -559,14 +558,6 @@ class ManualFillingMediator
private boolean canExtendKeyboard() {
if (!mModel.get(SHOW_WHEN_VISIBLE)) return false;
@@ -473,9 +473,9 @@ 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
@@ -38,12 +38,4 @@ found in the LICENSE file.
android:summary="@string/prefs_autofill_assistant_summary"
android:fragment="org.chromium.chrome.browser.autofill_assistant.AutofillAssistantPreferenceFragment"
@@ -32,12 +32,4 @@ found in the LICENSE file.
android:summary="@string/price_notifications_settings_description"
android:fragment="org.chromium.chrome.browser.commerce.PriceNotificationPreferenceFragment"
app:isPreferenceVisible="false"/>
- <org.chromium.components.browser_ui.settings.ChromeBasePreference
- android:key="usage_stats_reporting"
@@ -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
@@ -1720,7 +1720,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -1684,7 +1684,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,
@@ -2847,7 +2847,7 @@ public class ChromeTabbedActivity extends ChromeActivity<ChromeActivityComponent
@@ -2818,7 +2818,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,
@@ -524,7 +524,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedAct
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
@@ -92,9 +92,6 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
@@ -91,9 +91,6 @@ import org.chromium.chrome.browser.compositor.layouts.SceneChangeObserver;
import org.chromium.chrome.browser.compositor.layouts.content.ContentOffsetProvider;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManagerHandler;
@@ -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;
@@ -254,7 +251,7 @@ import java.util.function.Consumer;
@@ -253,7 +250,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,
@@ -321,8 +318,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -320,8 +317,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
new ObservableSupplierImpl<>();
protected final UnownedUserDataSupplier<InsetObserverView> mInsetObserverViewSupplier =
new InsetObserverViewSupplier();
@@ -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(),
@@ -948,14 +943,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -947,14 +942,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");
}
@@ -1426,11 +1413,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1428,11 +1415,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);
}
@@ -1928,13 +1910,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1920,13 +1902,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.
@@ -1980,15 +1955,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -1975,15 +1950,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
}
/**
@@ -2260,18 +2226,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
@@ -2255,18 +2221,6 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
return webContents != null ? SelectionPopupController.fromWebContents(webContents) : null;
}
@@ -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
@@ -46,7 +46,6 @@ import org.chromium.ui.text.SpanApplier;
@@ -47,7 +47,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;
import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
@@ -70,9 +69,7 @@ public class PrivacySettings
@@ -71,9 +70,7 @@ public class PrivacySettings extends PreferenceFragmentCompat
// 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());
@@ -129,12 +126,6 @@ public class PrivacySettings
@@ -131,12 +128,6 @@ public class PrivacySettings extends PreferenceFragmentCompat
mSearchSuggestions.setOnPreferenceChangeListener(this);
mSearchSuggestions.setManagedPreferenceDelegate(mManagedPreferenceDelegate);
@@ -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;
@@ -267,7 +266,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -261,7 +260,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,
@@ -302,7 +301,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
@@ -296,7 +295,7 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator {
boolean initializeUiWithIncognitoColors, @NonNull BackPressManager backPressManager) {
super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier, tabProvider,
profileSupplier, bookmarkModelSupplier, tabBookmarkerSupplier,
@@ -931,7 +931,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/Tab
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
@@ -51,7 +51,6 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
@@ -53,7 +53,6 @@ import org.chromium.chrome.browser.compositor.bottombar.OverlayPanelManager;
import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator;
import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl;
import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
@@ -939,7 +939,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
import org.chromium.chrome.browser.crash.ChromePureJavaExceptionReporter;
import org.chromium.chrome.browser.directactions.DirectActionInitializer;
import org.chromium.chrome.browser.dom_distiller.ReaderModeToolbarButtonController;
@@ -95,7 +94,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
@@ -97,7 +96,6 @@ import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.price_tracking.PriceTrackingButtonController;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -947,7 +947,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
import org.chromium.chrome.browser.settings.SettingsLauncherImpl;
import org.chromium.chrome.browser.share.ShareButtonController;
import org.chromium.chrome.browser.share.ShareDelegate;
@@ -237,7 +235,6 @@ public class RootUiCoordinator
@@ -243,7 +241,6 @@ public class RootUiCoordinator
private List<ButtonDataProvider> mButtonDataProviders;
@Nullable
private AdaptiveToolbarButtonController mAdaptiveToolbarButtonController;
@@ -955,7 +955,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
private IdentityDiscController mIdentityDiscController;
private ChromeActionModeHandler mChromeActionModeHandler;
private final ToolbarActionModeCallback mActionModeControllerCallback;
@@ -250,7 +247,6 @@ public class RootUiCoordinator
@@ -256,7 +253,6 @@ public class RootUiCoordinator
private final ObservableSupplier<TabBookmarker> mTabBookmarkerSupplier;
private final OneshotSupplierImpl<AppMenuCoordinator> mAppMenuSupplier;
private BottomSheetObserver mBottomSheetObserver;
@@ -963,7 +963,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
protected final CallbackController mCallbackController;
protected final BrowserControlsManager mBrowserControlsManager;
private BrowserControlsStateProvider.Observer mBrowserControlsObserver;
@@ -355,7 +351,7 @@ public class RootUiCoordinator
@@ -361,7 +357,7 @@ public class RootUiCoordinator
@NonNull ObservableSupplier<Profile> profileSupplier,
@NonNull ObservableSupplier<BookmarkModel> bookmarkModelSupplier,
@NonNull ObservableSupplier<TabBookmarker> tabBookmarkerSupplier,
@@ -972,7 +972,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
@NonNull ObservableSupplier<TabModelSelector> tabModelSelectorSupplier,
@NonNull OneshotSupplier<StartSurface> startSurfaceSupplier,
@NonNull OneshotSupplier<TabSwitcher> tabSwitcherSupplier,
@@ -448,7 +444,6 @@ public class RootUiCoordinator
@@ -454,7 +450,6 @@ public class RootUiCoordinator
mBookmarkModelSupplier = bookmarkModelSupplier;
mTabBookmarkerSupplier = tabBookmarkerSupplier;
mAppMenuSupplier = new OneshotSupplierImpl<>();
@@ -980,7 +980,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
mActionModeControllerCallback = new ToolbarActionModeCallback();
mTabModelSelectorSupplier = tabModelSelectorSupplier;
@@ -552,11 +547,6 @@ public class RootUiCoordinator
@@ -566,11 +561,6 @@ public class RootUiCoordinator
mToolbarManager = null;
}
@@ -992,7 +992,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
if (mAdaptiveToolbarButtonController != null) {
mAdaptiveToolbarButtonController.destroy();
mAdaptiveToolbarButtonController = null;
@@ -971,15 +961,6 @@ public class RootUiCoordinator
@@ -985,15 +975,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)) {
@@ -1134,11 +1115,6 @@ public class RootUiCoordinator
@@ -1160,11 +1141,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);
@@ -1207,10 +1183,6 @@ public class RootUiCoordinator
@@ -1233,10 +1209,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) {
@@ -1331,10 +1303,6 @@ public class RootUiCoordinator
@@ -1357,10 +1329,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
}
/**
@@ -1491,9 +1459,6 @@ public class RootUiCoordinator
@@ -1517,9 +1485,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
@@ -1501,8 +1466,6 @@ public class RootUiCoordinator
@@ -1527,8 +1492,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
@@ -2092,7 +2092,6 @@ static_library("browser") {
@@ -2049,7 +2049,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",
@@ -2576,8 +2575,6 @@ static_library("browser") {
@@ -2546,8 +2545,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",
@@ -2598,8 +2595,6 @@ static_library("browser") {
@@ -2568,8 +2565,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",
@@ -2622,16 +2617,6 @@ static_library("browser") {
@@ -2592,16 +2587,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",
@@ -3186,8 +3171,6 @@ static_library("browser") {
@@ -3139,8 +3124,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,9 +1119,9 @@ 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
@@ -1979,27 +1979,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesUiVariations[] = {
{"verbose", &kRelatedSearchesUiVerbose, 1, nullptr},
{"extreme", &kRelatedSearchesUiExtreme, 1, nullptr},
@@ -2152,27 +2152,6 @@ const FeatureEntry::FeatureVariation kRelatedSearchesVariations[] = {
{"from content", &kRelatedSearchesContent, 1, nullptr},
{"support all languages", &kRelatedSearchesAllLanguages, 1, nullptr},
};
-
-const FeatureEntry::FeatureParam kContextualSearchSuppressShortViewWith300Dp[] =
@@ -1146,11 +1146,11 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-
#endif // BUILDFLAG(IS_ANDROID)
const FeatureEntry::FeatureParam kResamplingInputEventsLSQEnabled[] = {
@@ -3340,18 +3319,6 @@ const FeatureEntry kFeatureEntries[] = {
flag_descriptions::kEnableOskResizesVisualViewportByDefaultDescription,
kOsAndroid,
FEATURE_VALUE_TYPE(blink::features::kOSKResizesVisualViewportByDefault)},
const FeatureEntry::FeatureParam
@@ -3582,18 +3561,6 @@ const FeatureEntry kFeatureEntries[] = {
SINGLE_VALUE_TYPE(extensions::switches::kExtensionsOnChromeURLs)},
#endif // ENABLE_EXTENSIONS
#if BUILDFLAG(IS_ANDROID)
- {"contextual-search-force-caption",
- flag_descriptions::kContextualSearchForceCaptionName,
- flag_descriptions::kContextualSearchForceCaptionDescription, kOsAndroid,
@@ -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"
@@ -220,11 +219,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
@@ -225,11 +224,6 @@ const base::Feature* const kFeaturesExposedToJava[] = {
&kContextMenuSearchAndShopWithGoogleLens,
&kContextMenuTranslateWithGoogleLens,
&kContextMenuPopupForAllScreenSizes,
@@ -1188,8 +1188,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
- &kContextualSearchThinWebViewImplementation,
&kDeferKeepScreenOnDuringGesture,
&kDeferNotifyInMotion,
&kExperimentsForAgsa,
@@ -685,26 +679,6 @@ BASE_FEATURE(kLensOnQuickActionSearchWidget,
&kDelayTransitionsForAnimation,
@@ -700,26 +694,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);
@@ -720,7 +694,6 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
@@ -739,7 +713,6 @@ BASE_FEATURE(kDownloadAutoResumptionThrottling,
BASE_FEATURE(kDownloadHomeForExternalApp,
"DownloadHomeForExternalApp",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -1227,7 +1227,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse
diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser/flags/android/chrome_feature_list.h
--- a/chrome/browser/flags/android/chrome_feature_list.h
+++ b/chrome/browser/flags/android/chrome_feature_list.h
@@ -76,11 +76,6 @@ BASE_DECLARE_FEATURE(kContextMenuSearchWithGoogleLens);
@@ -83,11 +83,6 @@ BASE_DECLARE_FEATURE(kContextMenuSearchWithGoogleLens);
BASE_DECLARE_FEATURE(kContextMenuShopWithGoogleLens);
BASE_DECLARE_FEATURE(kContextMenuSearchAndShopWithGoogleLens);
BASE_DECLARE_FEATURE(kContextMenuTranslateWithGoogleLens);
@@ -1238,7 +1238,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.h b/chrome/browser
-BASE_DECLARE_FEATURE(kContextualSearchThinWebViewImplementation);
BASE_DECLARE_FEATURE(kDeferKeepScreenOnDuringGesture);
BASE_DECLARE_FEATURE(kDeferNotifyInMotion);
BASE_DECLARE_FEATURE(kDontPrefetchLibraries);
BASE_DECLARE_FEATURE(kDelayTransitionsForAnimation);
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
@@ -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"
@@ -1937,10 +1936,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
@@ -1977,10 +1976,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildHandlerList(
std::make_unique<URLBlocklistPolicyHandler>(key::kURLBlocklist));
// Policies for all platforms - End
@@ -1265,7 +1265,7 @@ diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -800,33 +800,6 @@ CHAR_LIMIT guidelines:
@@ -803,33 +803,6 @@ CHAR_LIMIT guidelines:
<message name="IDS_AD_PRIVACY_LINK_ROW_SUB_LABEL" desc="A string that describes 'Ad privacy', the label that appears just above it. For context, this new 'Ad privacy' / 'Customize the info...' pair of strings is similar to the existing 'Clear browsing data' / 'Clear history, cookies...' that you find on chrome://settings/privacy. * 'Customize': From our word list: 'This word describes user agency in refining their personalized recommendations, elements of the experience, or sometimes products'. Please don't confuse with 'personalize', which we reserve to mean: '...when Google provides recommendations and other content for users based on their data'. **** CONTEXT PRIVACY SANDBOX **** Chrome’s Privacy Sandbox initiative 1) deprecates third-party cookies in Chrome, 2) supports free and open content on the web (by finding better ways to support ads online), 3) while providing stronger privacy protections for users. You can see a high-level description of this public project at www.privacysanbox.com. **** NEW SETTINGS SECTION IN CHROME **** 3 new ad-specific settings appear on an “Ad privacy” page in Chrome settings. For an equivalent structure, see “Security” on chrome://settings/privacy that opens chrome://settings/security. Likewise, “Ad privacy” on chrome://settings/privacy will open chrome://settings/AdPrivacy.">
Customize the info used by sites to show you ads
</message>
@@ -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>
@@ -4123,38 +4096,6 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
@@ -4135,38 +4108,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
@@ -1035,8 +1035,8 @@ mojom("android_mojo_bindings") {
@@ -1049,8 +1049,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" ]
build/patches/Remove-price-shopping-commerce-integrations.patch
+142 -441
View File
File diff suppressed because it is too large Load Diff
build/patches/Remove-signin-and-sync-integrations.patch
+284 -508
View File
File diff suppressed because it is too large Load Diff
build/patches/Remove-voice-recognition-integration.patch
+57 -61
View File
@@ -15,15 +15,15 @@ License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
.../SearchActivityLocationBarLayout.java | 42 +------
.../browser/toolbar/ToolbarManager.java | 6 -
.../chrome/browser/ui/RootUiCoordinator.java | 23 +---
chrome/browser/ui/android/omnibox/BUILD.gn | 5 -
chrome/browser/ui/android/omnibox/BUILD.gn | 2 -
.../chrome/browser/omnibox/LocationBar.java | 6 -
.../omnibox/LocationBarCoordinator.java | 13 ---
.../browser/omnibox/LocationBarMediator.java | 110 +-----------------
.../browser/omnibox/LocationBarMediator.java | 109 +-----------------
.../chrome/browser/omnibox/OmniboxStub.java | 8 --
.../suggestions/AutocompleteController.java | 21 ----
.../suggestions/AutocompleteCoordinator.java | 8 --
.../suggestions/AutocompleteMediator.java | 9 --
19 files changed, 12 insertions(+), 363 deletions(-)
19 files changed, 12 insertions(+), 359 deletions(-)
diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java b/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
--- a/chrome/android/features/start_surface/java/src/org/chromium/chrome/features/start_surface/StartSurfaceMediator.java
@@ -60,7 +60,7 @@ diff --git a/chrome/android/features/start_surface/java/src/org/chromium/chrome/
});
mPropertyModel.set(LENS_BUTTON_CLICK_LISTENER, v -> {
@@ -1317,10 +1308,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
@@ -1330,10 +1321,6 @@ class StartSurfaceMediator implements TabSwitcher.TabSwitcherViewObserver, View.
// incorrect state if check synchronously.
ThreadUtils.postOnUiThread(() -> {
if (mOmniboxStub != null) {
@@ -103,7 +103,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/init/ProcessIni
import org.chromium.chrome.browser.optimization_guide.OptimizationGuideBridgeFactory;
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
import org.chromium.chrome.browser.photo_picker.DecoderService;
@@ -430,10 +429,6 @@ public class ProcessInitializationHandler {
@@ -427,10 +426,6 @@ public class ProcessInitializationHandler {
deferredStartupHandler.addDeferredTask(
() -> OfflineMeasurementsBackgroundTask.clearPersistedDataFromPrefs());
deferredStartupHandler.addDeferredTask(() -> QueryTileUtils.isQueryTilesEnabledOnNTP());
@@ -161,7 +161,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.profiles.ProfileKey;
@@ -109,8 +108,7 @@ import java.util.List;
@@ -108,8 +107,7 @@ import java.util.List;
*/
public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvider,
TemplateUrlServiceObserver,
@@ -171,7 +171,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.
@@ -142,7 +140,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -141,7 +139,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
protected boolean mSearchProviderHasLogo;
protected OmniboxStub mOmniboxStub;
@@ -179,7 +179,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;
@@ -222,8 +219,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -221,8 +218,7 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@Override
public boolean isVoiceSearchEnabled() {
@@ -189,7 +189,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
}
@Override
@@ -231,21 +227,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -230,21 +226,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
if (mIsDestroyed) return;
FeedReliabilityLogger feedReliabilityLogger =
mFeedSurfaceProvider.getReliabilityLogger();
@@ -211,7 +211,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
}
@Override
@@ -744,12 +725,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -742,12 +723,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
mOmniboxStub.addUrlFocusChangeListener(feedReliabilityLogger);
}
}
@@ -224,7 +224,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
}
@Override
@@ -760,11 +735,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -758,11 +733,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
}
}
@@ -236,7 +236,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);
@@ -784,9 +754,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -782,9 +752,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
RecordUserAction.record("MobileNTPShown");
mJankTracker.startTrackingScenario(JankScenario.NEW_TAB_PAGE);
SuggestionsMetrics.recordSurfaceVisible();
@@ -246,7 +246,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. */
@@ -795,7 +762,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -793,7 +760,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
RecordHistogram.recordMediumTimesHistogram("NewTabPage.TimeSpent",
(System.nanoTime() - mLastShownTimeNs) / TimeUtils.NANOSECONDS_PER_MILLISECOND);
SuggestionsMetrics.recordSurfaceHidden();
@@ -254,7 +254,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.
}
/**
@@ -894,9 +860,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
@@ -892,9 +858,6 @@ public class NewTabPage implements NativePage, InvalidationAwareThumbnailProvide
}
mFeedSurfaceProvider.destroy();
mTab.getWindowAndroid().removeContextMenuCloseListener(mContextMenuManager);
@@ -353,7 +353,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manage
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/SearchActivity.java
@@ -50,7 +50,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
@@ -51,7 +51,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils;
import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener;
@@ -361,7 +361,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;
@@ -356,14 +355,12 @@ public class SearchActivity extends AsyncInitializationActivity
@@ -373,14 +372,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);
@@ -377,7 +377,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
RecordUserAction.record("SearchWidget.WidgetSelected");
getActivityDelegate().onFinishDeferredInitialization();
@@ -434,8 +431,7 @@ public class SearchActivity extends AsyncInitializationActivity
@@ -451,8 +448,7 @@ public class SearchActivity extends AsyncInitializationActivity
if (isFromQuickActionSearchWidget()) {
recordQuickActionSearchType(searchType);
}
@@ -496,15 +496,15 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/searchwidget/Se
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -87,7 +87,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
@@ -86,7 +86,6 @@ import org.chromium.chrome.browser.omnibox.OverrideUrlLoadingDelegate;
import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils;
import org.chromium.chrome.browser.omnibox.UrlFocusChangeListener;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
import org.chromium.chrome.browser.omnibox.suggestions.ActionChipsDelegate;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.page_info.ChromePageInfo;
import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
@@ -2045,11 +2044,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
@@ -2068,11 +2067,6 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve
return mLocationBar.getOmniboxStub();
}
@@ -519,16 +519,16 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/Toolbar
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java
@@ -87,8 +87,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer;
@@ -89,8 +89,6 @@ import org.chromium.chrome.browser.messages.MessagesResourceMapperInitializer;
import org.chromium.chrome.browser.omnibox.OmniboxFocusReason;
import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
import org.chromium.chrome.browser.omnibox.suggestions.ActionChipsDelegate;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceInteractionSource;
import org.chromium.chrome.browser.paint_preview.DemoPaintPreview;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.profiles.Profile;
@@ -264,7 +262,6 @@ public class RootUiCoordinator
@@ -270,7 +268,6 @@ public class RootUiCoordinator
protected OneshotSupplierImpl<Boolean> mPromoShownOneshotSupplier = new OneshotSupplierImpl<>();
protected Supplier<Tab> mStartSurfaceParentTabSupplier;
@Nullable
@@ -536,7 +536,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
private MediaCaptureOverlayController mCaptureController;
private @Nullable ScrollCaptureManager mScrollCaptureManager;
protected final ActivityLifecycleDispatcher mActivityLifecycleDispatcher;
@@ -539,9 +536,6 @@ public class RootUiCoordinator
@@ -553,9 +550,6 @@ public class RootUiCoordinator
}
if (mToolbarManager != null) {
@@ -546,7 +546,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
mToolbarManager.destroy();
mToolbarManager = null;
}
@@ -1058,19 +1052,11 @@ public class RootUiCoordinator
@@ -1072,19 +1066,11 @@ public class RootUiCoordinator
new VoiceToolbarButtonController.VoiceSearchDelegate() {
@Override
public boolean isVoiceSearchEnabled() {
@@ -566,8 +566,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordi
- VoiceInteractionSource.TOOLBAR);
}
};
VoiceToolbarButtonController voiceToolbarButtonController =
@@ -1119,13 +1105,6 @@ public class RootUiCoordinator
TranslateToolbarButtonController translateToolbarButtonController =
@@ -1145,13 +1131,6 @@ public class RootUiCoordinator
if (!mSupportsAppMenuSupplier.getAsBoolean()) {
mToolbarManager.getToolbar().disableMenuButton();
}
@@ -584,13 +584,10 @@ 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
@@ -129,11 +129,6 @@ android_library("java") {
@@ -130,8 +130,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",
- "java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchConsentBottomSheet.java",
- "java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchConsentController.java",
- "java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchConsentUi.java",
- "java/src/org/chromium/chrome/browser/omnibox/voice/AssistantVoiceSearchService.java",
- "java/src/org/chromium/chrome/browser/omnibox/voice/VoiceRecognitionHandler.java",
]
@@ -622,15 +619,15 @@ 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
@@ -41,7 +41,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.OmniboxPedalDelegate;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownEmbedder;
@@ -40,7 +40,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteDelegate;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestionsDropdownScrollListener;
import org.chromium.chrome.browser.omnibox.suggestions.basic.BasicSuggestionProcessor.BookmarkState;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManager;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
@@ -381,13 +380,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -382,13 +381,6 @@ public class LocationBarCoordinator
return mLocationBarLayout.getSecurityIconView();
}
@@ -644,7 +641,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
@Nullable
@Override
public OmniboxStub getOmniboxStub() {
@@ -672,11 +664,6 @@ public class LocationBarCoordinator implements LocationBar, NativeInitObserver,
@@ -661,11 +653,6 @@ public class LocationBarCoordinator
// End tablet-specific methods.
@@ -659,7 +656,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/LocationBarMediator.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/LocationBarMediator.java
@@ -51,8 +51,6 @@ import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
@@ -52,8 +52,6 @@ import org.chromium.chrome.browser.omnibox.geo.GeolocationHeader;
import org.chromium.chrome.browser.omnibox.status.StatusCoordinator;
import org.chromium.chrome.browser.omnibox.styles.OmniboxResourceProvider;
import org.chromium.chrome.browser.omnibox.suggestions.AutocompleteCoordinator;
@@ -678,7 +675,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
UrlBarDelegate, OnKeyListener, ComponentCallbacks,
TemplateUrlService.TemplateUrlServiceObserver, BackPressHandler {
private static final int ICON_FADE_ANIMATION_DURATION_MS = 150;
@@ -147,10 +144,7 @@ class LocationBarMediator
@@ -150,10 +147,7 @@ class LocationBarMediator
};
private final LocationBarLayout mLocationBarLayout;
@@ -689,18 +686,17 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
private StatusCoordinator mStatusCoordinator;
private AutocompleteCoordinator mAutocompleteCoordinator;
private OmniboxPrerender mOmniboxPrerender;
@@ -215,10 +209,6 @@ class LocationBarMediator
@@ -220,9 +214,6 @@ class LocationBarMediator
mLocationBarDataProvider.addObserver(this);
mOverrideUrlLoadingDelegate = overrideUrlLoadingDelegate;
mLocaleManager = localeManager;
- mVoiceRecognitionHandler =
- new VoiceRecognitionHandler(this, mAssistantVoiceSearchServiceSupplier,
- launchAssistanceSettingsAction, profileSupplier);
- mVoiceRecognitionHandler = new VoiceRecognitionHandler(
- this, mAssistantVoiceSearchServiceSupplier, profileSupplier);
- mVoiceRecognitionHandler.addObserver(this);
mProfileSupplier = profileSupplier;
mProfileSupplier.addObserver(mCallbackController.makeCancelable(this::setProfile));
mPrivacyPreferencesManager = privacyPreferencesManager;
@@ -253,9 +243,6 @@ class LocationBarMediator
@@ -258,9 +249,6 @@ class LocationBarMediator
}
/*package */ void destroy() {
@@ -710,7 +706,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
if (mTemplateUrlServiceSupplier.hasValue()) {
mTemplateUrlServiceSupplier.get().removeObserver(this);
}
@@ -263,8 +250,6 @@ class LocationBarMediator
@@ -268,8 +256,6 @@ class LocationBarMediator
mAutocompleteCoordinator = null;
mUrlCoordinator = null;
mPrivacyPreferencesManager = null;
@@ -719,7 +715,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
mLocationBarDataProvider.removeObserver(this);
mDeferredNativeRunnables.clear();
mUrlFocusChangeListeners.clear();
@@ -321,13 +306,6 @@ class LocationBarMediator
@@ -326,13 +312,6 @@ class LocationBarMediator
mOmniboxPrerender = new OmniboxPrerender();
mTemplateUrlServiceSupplier.onAvailable((templateUrlService) -> {
templateUrlService.addObserver(this);
@@ -733,7 +729,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
});
mLocationBarLayout.onFinishNativeInitialization();
@@ -378,17 +356,6 @@ class LocationBarMediator
@@ -383,17 +362,6 @@ class LocationBarMediator
mLocationBarLayout.setUnfocusedWidth(unfocusedWidth);
}
@@ -751,7 +747,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/* package */ void setLensControllerForTesting(LensController lensController) {
mLensController = lensController;
}
@@ -397,11 +364,6 @@ class LocationBarMediator
@@ -402,11 +370,6 @@ class LocationBarMediator
sLastCachedIsLensOnOmniboxEnabled = null;
}
@@ -763,7 +759,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
/* package */ void setIsUrlBarFocusedWithoutAnimationsForTesting(
boolean isUrlBarFocusedWithoutAnimations) {
mUrlFocusedWithoutAnimations = isUrlBarFocusedWithoutAnimations;
@@ -601,8 +563,6 @@ class LocationBarMediator
@@ -606,8 +569,6 @@ class LocationBarMediator
mUrlCoordinator.setKeyboardVisibility(false, false);
RecordUserAction.record("MobileOmniboxVoiceSearch");
@@ -772,7 +768,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
}
/** package */ void lensButtonClicked(View view) {
@@ -948,28 +908,6 @@ class LocationBarMediator
@@ -959,28 +920,6 @@ class LocationBarMediator
}
}
@@ -801,7 +797,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.
*/
@@ -1056,8 +994,7 @@ class LocationBarMediator
@@ -1067,8 +1006,7 @@ class LocationBarMediator
private boolean shouldShowMicButton() {
if (shouldShowDeleteButton()) return false;
@@ -811,7 +807,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
return false;
}
boolean isToolbarMicEnabled = mIsToolbarMicEnabledSupplier.getAsBoolean();
@@ -1252,9 +1189,6 @@ class LocationBarMediator
@@ -1263,9 +1201,6 @@ class LocationBarMediator
public void onPrimaryColorChanged() {
// This method needs to be called first as it computes |mBrandedColorScheme|.
updateBrandedColorScheme();
@@ -821,7 +817,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
}
@Override
@@ -1326,16 +1260,6 @@ class LocationBarMediator
@@ -1351,16 +1286,6 @@ class LocationBarMediator
}
}
@@ -838,7 +834,7 @@ diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/brow
@Override
public void addUrlFocusChangeListener(UrlFocusChangeListener listener) {
mUrlFocusChangeListeners.addObserver(listener);
@@ -1351,37 +1275,10 @@ class LocationBarMediator
@@ -1376,37 +1301,10 @@ class LocationBarMediator
return mUrlHasFocus;
}
@@ -876,7 +872,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;
@@ -1400,17 +1297,14 @@ class LocationBarMediator
@@ -1425,17 +1323,14 @@ class LocationBarMediator
mUrlCoordinator.setKeyboardVisibility(true, false);
}
@@ -922,15 +918,15 @@ 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/suggestions/AutocompleteController.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java
--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java
+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/AutocompleteController.java
@@ -12,7 +12,6 @@ import androidx.annotation.VisibleForTesting;
@@ -13,7 +13,6 @@ import androidx.annotation.VisibleForTesting;
import org.chromium.base.annotations.CalledByNative;
import org.chromium.base.annotations.NativeMethods;
import org.chromium.base.lifetime.Destroyable;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler.VoiceResult;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.tab.Tab;
import org.chromium.components.omnibox.AutocompleteMatch;
@@ -258,24 +257,6 @@ public class AutocompleteController {
@@ -260,24 +259,6 @@ public class AutocompleteController implements Destroyable {
completedLength, webContents);
}
@@ -955,7 +951,7 @@ 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.
@@ -367,8 +348,6 @@ public class AutocompleteController {
@@ -369,8 +350,6 @@ public class AutocompleteController implements Destroyable {
long nativeAutocompleteControllerAndroid, int matchIndex,
long elapsedTimeSinceInputChange, String newQueryText, String[] newQueryParams);
Tab getMatchingTabForSuggestion(long nativeAutocompleteControllerAndroid, int matchIndex);
@@ -967,15 +963,15 @@ 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/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
@@ -48,7 +48,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.pedal.PedalSuggestionView
import org.chromium.chrome.browser.omnibox.suggestions.pedal.PedalSuggestionViewBinder;
@@ -46,7 +46,6 @@ import org.chromium.chrome.browser.omnibox.suggestions.header.HeaderView;
import org.chromium.chrome.browser.omnibox.suggestions.header.HeaderViewBinder;
import org.chromium.chrome.browser.omnibox.suggestions.tail.TailSuggestionView;
import org.chromium.chrome.browser.omnibox.suggestions.tail.TailSuggestionViewBinder;
-import org.chromium.chrome.browser.omnibox.voice.VoiceRecognitionHandler;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.share.ShareDelegate;
import org.chromium.chrome.browser.tab.Tab;
@@ -306,13 +305,6 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
@@ -304,13 +303,6 @@ public class AutocompleteCoordinator implements UrlFocusChangeListener, UrlTextC
mMediator.onNativeInitialized();
}
@@ -1000,7 +996,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;
@@ -404,14 +403,6 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
@@ -410,14 +409,6 @@ class AutocompleteMediator implements OnSuggestionsReceivedListener,
mShouldPreventOmniboxAutocomplete = prevent;
}
build/patches/Welcome-screen.patch
+38 -402
View File
@@ -6,33 +6,14 @@ Allow toggling automatic updates
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../android/java/res/layout/fre_tosanduma.xml | 4 +-
.../firstrun/ChildAccountStatusSupplier.java | 14 +-
.../browser/firstrun/FirstRunActivity.java | 42 +----
.../firstrun/FirstRunActivityBase.java | 11 +-
.../firstrun/FirstRunFlowSequencer.java | 55 ++----
.../browser/firstrun/FirstRunUtils.java | 16 +-
.../firstrun/ToSAndUMAFirstRunFragment.java | 166 +++++-------------
.../strings/android_chrome_strings.grd | 27 ++-
8 files changed, 83 insertions(+), 252 deletions(-)
.../firstrun/ChildAccountStatusSupplier.java | 14 +----
.../browser/firstrun/FirstRunActivity.java | 18 -------
.../firstrun/FirstRunActivityBase.java | 6 +--
.../firstrun/FirstRunFlowSequencer.java | 52 +++++--------------
.../browser/firstrun/FirstRunUtils.java | 16 ++----
.../strings/android_chrome_strings.grd | 24 ++++++++-
6 files changed, 40 insertions(+), 90 deletions(-)
diff --git a/chrome/android/java/res/layout/fre_tosanduma.xml b/chrome/android/java/res/layout/fre_tosanduma.xml
--- a/chrome/android/java/res/layout/fre_tosanduma.xml
+++ b/chrome/android/java/res/layout/fre_tosanduma.xml
@@ -86,11 +86,11 @@ found in the LICENSE file.
android:textAppearance="@style/TextAppearance.TextMedium.Primary" />
<CheckBox
- android:id="@+id/send_report_checkbox"
+ android:id="@+id/auto_updater_checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:lineSpacingMultiplier="1.4"
- android:text="@string/fre_send_report_check"
+ android:text="@string/auto_updater_check"
android:paddingStart="@dimen/fre_tos_checkbox_padding"
android:textAppearance="@style/TextAppearance.TextMedium.Primary" />
</LinearLayout>
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildAccountStatusSupplier.java
@@ -68,9 +49,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ChildA
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunActivity.java
@@ -29,9 +29,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivity;
import org.chromium.chrome.browser.fonts.FontPreloader;
@@ -28,9 +28,6 @@ import org.chromium.chrome.browser.fonts.FontPreloader;
import org.chromium.chrome.browser.metrics.UmaUtils;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
-import org.chromium.chrome.browser.signin.SigninCheckerProvider;
-import org.chromium.chrome.browser.signin.SigninFirstRunFragment;
@@ -78,43 +59,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
import org.chromium.components.browser_ui.modaldialog.AppModalPresenter;
import org.chromium.components.metrics.LowEntropySource;
import org.chromium.ui.base.LocalizationUtils;
@@ -135,18 +132,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
/** Creates first page and sets up adapter. Should result UI being shown on the screen. */
private void createFirstPage() {
BooleanSupplier showWelcomePage = () -> !FirstRunStatus.shouldSkipWelcomePage();
- if (FREMobileIdentityConsistencyFieldTrial.isEnabled()) {
- mPages.add(new FirstRunPage<>(SigninFirstRunFragment.class, showWelcomePage));
- } else {
- // TODO(crbug.com/1111490): Revisit during post-MVP.
- // There's an edge case where we accept the welcome page in the main app, abort the FRE,
- // then go through this CCT FRE again.
- mPages.add(shouldCreateEnterpriseCctTosPage()
- ? new FirstRunPage<>(
- TosAndUmaFirstRunFragmentWithEnterpriseSupport.class,
- showWelcomePage)
- : new FirstRunPage<>(ToSAndUMAFirstRunFragment.class, showWelcomePage));
- }
+ mPages.add(new FirstRunPage<>(ToSAndUMAFirstRunFragment.class, showWelcomePage));
mFreProgressStates.add(MobileFreProgress.WELCOME_SHOWN);
mPagerAdapter = new FirstRunPagerAdapter(FirstRunActivity.this, mPages);
mPager.setAdapter(mPagerAdapter);
@@ -154,15 +140,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
// native and policy service have been initialized.
}
- private boolean shouldCreateEnterpriseCctTosPage() {
- // TODO(crbug.com/1111490): Revisit case when #shouldSkipWelcomePage = true.
- // If the client has already accepted ToS (FirstRunStatus#shouldSkipWelcomePage), do not
- // use the subclass ToSAndUmaCCTFirstRunFragment. Instead, use the base class
- // (ToSAndUMAFirstRunFragment) which simply shows a loading spinner while waiting for
- // native to be loaded.
- return mLaunchedFromCCT && !FirstRunStatus.shouldSkipWelcomePage();
- }
-
/**
* Create the page sequence which requires native initialized, and policies loaded if any
* on-device policies may exists.
@@ -177,13 +154,11 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
@@ -140,13 +137,11 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
//
// TODO(b/245912657): explicitly sign in supervised users in {@link
// SigninFirstRunMediator#handleContinueWithNative} rather than relying on SigninChecker.
@@ -128,7 +73,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
// An optional page to select a default search engine.
if (showSearchEnginePromo.getAsBoolean()) {
@@ -192,11 +167,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
@@ -155,11 +150,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
mFreProgressStates.add(MobileFreProgress.DEFAULT_SEARCH_ENGINE_SHOWN);
}
@@ -140,27 +85,18 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
if (mPagerAdapter != null) {
mPagerAdapter.notifyDataSetChanged();
}
@@ -241,10 +211,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
@@ -204,10 +194,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
@Override
public void triggerLayoutInflation() {
- // Generate trial group as early as possible to guarantee it's available by the time native
- // needs to register the synthetic trial group. See https://crbug.com/1295692 for details.
- FREMobileIdentityConsistencyFieldTrial.createFirstRunTrial();
- FREMobileIdentityConsistencyFieldTrial.createFirstRunVariationsTrial();
-
super.triggerLayoutInflation();
initializeStateFromLaunchData();
@@ -254,7 +220,7 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
setFinishOnTouchOutside(true);
setContentView(createContentView());
- if (FREMobileIdentityConsistencyFieldTrial.isEnabled() && mPagerAdapter == null) {
+ if (mPagerAdapter == null) {
// SigninFirstRunFragment doesn't use getProperties() and can be shown right away,
// without waiting for FirstRunFlowSequencer.
createFirstPage();
@@ -531,10 +497,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
@@ -488,10 +474,6 @@ public class FirstRunActivity extends FirstRunActivityBase implements FirstRunPa
public void acceptTermsOfService(boolean allowMetricsAndCrashUploading) {
assert mNativeInitializationPromise.isFulfilled();
@@ -183,18 +119,13 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
/** Base class for First Run Experience. */
public abstract class FirstRunActivityBase
@@ -100,14 +98,7 @@ public abstract class FirstRunActivityBase
@@ -100,9 +98,7 @@ public abstract class FirstRunActivityBase
@Override
@CallSuper
public void triggerLayoutInflation() {
- AccountManagerFacade accountManagerFacade = AccountManagerFacadeProvider.getInstance();
- if (FREMobileIdentityConsistencyFieldTrial.isEnabled()) {
- mChildAccountStatusSupplier = new ChildAccountStatusSupplier(
- accountManagerFacade, mFirstRunAppRestrictionInfo);
- } else {
- mChildAccountStatusSupplier =
- new ChildAccountStatusSupplier(accountManagerFacade, null);
- }
- mChildAccountStatusSupplier =
- new ChildAccountStatusSupplier(accountManagerFacade, mFirstRunAppRestrictionInfo);
+ mChildAccountStatusSupplier = new ChildAccountStatusSupplier();
}
@@ -202,11 +133,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunFlowSequencer.java
@@ -26,15 +26,9 @@ import org.chromium.chrome.browser.flags.ChromeSwitches;
@@ -25,14 +25,9 @@ import org.chromium.chrome.browser.flags.ChromeSwitches;
import org.chromium.chrome.browser.locale.LocaleManager;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.chrome.browser.search_engines.SearchEnginePromoType;
-import org.chromium.chrome.browser.signin.services.FREMobileIdentityConsistencyFieldTrial;
-import org.chromium.chrome.browser.signin.services.IdentityServicesProvider;
-import org.chromium.chrome.browser.signin.services.SigninManager;
import org.chromium.components.crash.CrashKeyIndex;
@@ -218,7 +148,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
import java.util.List;
@@ -59,27 +53,7 @@ public abstract class FirstRunFlowSequencer {
@@ -57,38 +52,19 @@ public abstract class FirstRunFlowSequencer {
/** Returns true if the sync consent promo page should be shown. */
boolean shouldShowSyncConsentPage(
Activity activity, List<Account> accounts, boolean isChild) {
@@ -234,19 +164,20 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
- // if sync is not allowed.
return false;
- }
- if (FREMobileIdentityConsistencyFieldTrial.isEnabled()) {
- // Show the sync consent page only to the signed-in users.
- return identityManager.hasPrimaryAccount(ConsentLevel.SIGNIN);
- } else {
- // We show the sync consent page if sync is allowed, and not signed in, and
- // - "skip the first use hints" is not set, or
- // - "skip the first use hints" is set, but there is at least one account.
- return !shouldSkipFirstUseHints(activity) || !accounts.isEmpty();
- }
- return identityManager.hasPrimaryAccount(ConsentLevel.SIGNIN);
}
/** @return true if the Search Engine promo page should be shown. */
@@ -94,10 +68,7 @@ public abstract class FirstRunFlowSequencer {
@VisibleForTesting
public boolean shouldShowSearchEnginePage() {
- @SearchEnginePromoType
- int searchPromoType = LocaleManager.getInstance().getSearchEnginePromoShowType();
- return searchPromoType == SearchEnginePromoType.SHOW_NEW
- || searchPromoType == SearchEnginePromoType.SHOW_EXISTING;
+ return false;
}
/** @return true if Sync is allowed for the current user. */
@VisibleForTesting
protected boolean isSyncAllowed() {
@@ -256,9 +187,9 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
- && signinManager.isSigninSupported();
+ return false;
}
}
/** @return true if first use hints should be skipped. */
@@ -149,12 +120,8 @@ public abstract class FirstRunFlowSequencer {
@@ -132,12 +108,8 @@ public abstract class FirstRunFlowSequencer {
* method.
*/
void start() {
@@ -273,7 +204,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
}
@VisibleForTesting
@@ -179,14 +146,10 @@ public abstract class FirstRunFlowSequencer {
@@ -162,14 +134,10 @@ public abstract class FirstRunFlowSequencer {
}
private void maybeProcessFreEnvironmentPreNative() {
@@ -288,7 +219,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
onFlowIsKnown(freProperties);
}
@@ -197,8 +160,8 @@ public abstract class FirstRunFlowSequencer {
@@ -180,8 +148,8 @@ public abstract class FirstRunFlowSequencer {
* @param freProperties Resulting FRE properties bundle.
*/
public void updateFirstRunProperties(Bundle freProperties) {
@@ -299,7 +230,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
freProperties.putBoolean(
FirstRunActivity.SHOW_SEARCH_ENGINE_PAGE, shouldShowSearchEnginePage());
}
@@ -299,13 +262,17 @@ public abstract class FirstRunFlowSequencer {
@@ -282,13 +250,17 @@ public abstract class FirstRunFlowSequencer {
if (!(caller instanceof Activity)) {
freIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
@@ -322,7 +253,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstRunUtils.java
@@ -17,9 +17,6 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats;
@@ -18,9 +18,6 @@ import org.chromium.chrome.browser.metrics.UmaSessionStats;
import org.chromium.chrome.browser.preferences.ChromePreferenceKeys;
import org.chromium.chrome.browser.preferences.SharedPreferencesManager;
import org.chromium.chrome.browser.util.ChromeAccessibilityUtil;
@@ -332,7 +263,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
/** Provides first run related utility functions. */
public class FirstRunUtils {
@@ -81,16 +78,12 @@ public class FirstRunUtils {
@@ -83,16 +80,12 @@ public class FirstRunUtils {
* @return Whether or not sync is allowed on this device.
*/
static boolean canAllowSync() {
@@ -351,7 +282,7 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
}
@VisibleForTesting
@@ -100,10 +93,7 @@ public class FirstRunUtils {
@@ -102,10 +95,7 @@ public class FirstRunUtils {
@VisibleForTesting
static boolean hasGoogleAccounts() {
@@ -363,307 +294,12 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/FirstR
}
@SuppressLint("InlinedApi")
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
--- a/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/firstrun/ToSAndUMAFirstRunFragment.java
@@ -16,16 +16,18 @@ import android.widget.Button;
import android.widget.CheckBox;
import android.widget.TextView;
+import android.content.SharedPreferences;
+import org.chromium.chrome.browser.omaha.OmahaBase;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.fragment.app.Fragment;
+import org.chromium.base.Log;
import org.chromium.base.metrics.RecordHistogram;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl;
-import org.chromium.chrome.browser.signin.services.FREMobileIdentityConsistencyFieldTrial;
-import org.chromium.chrome.browser.ui.signin.fre.FreUMADialogCoordinator;
import org.chromium.components.version_info.VersionInfo;
import org.chromium.ui.modaldialog.ModalDialogManagerHolder;
import org.chromium.ui.text.NoUnderlineClickableSpan;
@@ -41,7 +43,7 @@ import java.util.List;
* User Metrics Analysis) as defined in the Chrome Privacy Notice.
*/
public class ToSAndUMAFirstRunFragment
- extends Fragment implements FirstRunFragment, FreUMADialogCoordinator.Listener {
+ extends Fragment implements FirstRunFragment {
/** Alerts about some methods once ToSAndUMAFirstRunFragment executes them. */
public interface Observer {
/** See {@link #onNativeInitialized}. */
@@ -62,7 +64,8 @@ public class ToSAndUMAFirstRunFragment
private boolean mUserInteractedWithUmaCheckbox;
private Button mAcceptButton;
- private CheckBox mSendReportCheckBox;
+ private CheckBox mAutoUpdaterCheckBox;
+ private boolean mAutoUpdaterChecked;
private TextView mTosAndPrivacy;
private View mTitle;
private View mProgressSpinner;
@@ -89,14 +92,14 @@ public class ToSAndUMAFirstRunFragment
mProgressSpinner = view.findViewById(R.id.progress_spinner);
mProgressSpinner.setVisibility(View.GONE);
mAcceptButton = (Button) view.findViewById(R.id.terms_accept);
- mSendReportCheckBox = (CheckBox) view.findViewById(R.id.send_report_checkbox);
+ mAutoUpdaterCheckBox = (CheckBox) view.findViewById(R.id.auto_updater_checkbox);
mTosAndPrivacy = (TextView) view.findViewById(R.id.tos_and_privacy);
// Register event listeners.
mAcceptButton.setOnClickListener((v) -> onTosButtonClicked());
- mSendReportCheckBox.setOnCheckedChangeListener(((compoundButton, isChecked) -> {
- mAllowMetricsAndCrashUploading = isChecked;
- mUserInteractedWithUmaCheckbox = true;
+ mAutoUpdaterCheckBox.setOnCheckedChangeListener(
+ ((compoundButton, isChecked) -> {
+ mAutoUpdaterChecked = isChecked;
}));
// Make TextView links clickable.
@@ -113,7 +116,9 @@ public class ToSAndUMAFirstRunFragment
// initialized at which point the activity will skip the page.
// We distinguish case 1 from case 2 by the value of |mNativeInitialized|, as that is set
// via onAttachFragment() from FirstRunActivity - which is before this onViewCreated().
- if (isWaitingForNativeAndPolicyInit() && FirstRunStatus.shouldSkipWelcomePage()) {
+ boolean isW = isWaitingForNativeAndPolicyInit();
+ boolean ssw = FirstRunStatus.shouldSkipWelcomePage();
+ if (isW && ssw) {
setSpinnerVisible(true);
}
}
@@ -139,7 +144,7 @@ public class ToSAndUMAFirstRunFragment
// On certain versions of Android, the checkbox will appear unchecked upon revisiting
// the page. Force it to the end state of the drawable animation as a work around.
// crbug.com/666258
- mSendReportCheckBox.jumpDrawablesToCurrentState();
+ mAutoUpdaterCheckBox.jumpDrawablesToCurrentState();
}
}
@@ -166,13 +171,7 @@ public class ToSAndUMAFirstRunFragment
assert !isWaitingForNativeAndPolicyInit();
setSpinnerVisible(false);
- mSendReportCheckBox.setChecked(mAllowMetricsAndCrashUploading);
- }
-
- /** Implements {@link FreUMADialogCoordinator.Listener} */
- @Override
- public void onAllowMetricsAndCrashUploadingChecked(boolean allowMetricsAndCrashUploading) {
- mAllowMetricsAndCrashUploading = allowMetricsAndCrashUploading;
+ mAutoUpdaterCheckBox.setChecked(true);
}
private void updateView() {
@@ -181,116 +180,39 @@ public class ToSAndUMAFirstRunFragment
return;
}
- final boolean umaDialogMayBeShown =
- FREMobileIdentityConsistencyFieldTrial.shouldShowOldFreWithUmaDialog();
- final boolean hasChildAccount = getPageDelegate().getProperties().getBoolean(
- SyncConsentFirstRunFragment.IS_CHILD_ACCOUNT, false);
- final boolean isMetricsReportingDisabledByPolicy = !isWaitingForNativeAndPolicyInit()
- && !PrivacyPreferencesManagerImpl.getInstance()
- .isUsageAndCrashReportingPermittedByPolicy();
-
- updateTosText(umaDialogMayBeShown, hasChildAccount, isMetricsReportingDisabledByPolicy);
-
- updateReportCheckbox(umaDialogMayBeShown, isMetricsReportingDisabledByPolicy);
- }
-
- private SpanInfo buildTermsOfServiceLink() {
- NoUnderlineClickableSpan clickableGoogleTermsSpan =
- new NoUnderlineClickableSpan(getContext(), (view1) -> {
- if (!isAdded()) return;
- getPageDelegate().showInfoPage(R.string.google_terms_of_service_url);
- });
- return new SpanInfo("<TOS_LINK>", "</TOS_LINK>", clickableGoogleTermsSpan);
- }
+ updateTosText();
- private SpanInfo buildAdditionalTermsOfServiceLink() {
- NoUnderlineClickableSpan clickableChromeAdditionalTermsSpan =
- new NoUnderlineClickableSpan(getContext(), (view1) -> {
- if (!isAdded()) return;
- getPageDelegate().showInfoPage(R.string.chrome_additional_terms_of_service_url);
- });
- return new SpanInfo("<ATOS_LINK>", "</ATOS_LINK>", clickableChromeAdditionalTermsSpan);
+ updateReportCheckbox();
}
- private SpanInfo buildPrivacyPolicyLink() {
- NoUnderlineClickableSpan clickableFamilyLinkPrivacySpan =
+ private SpanInfo buildPrivacyPolicyLink(String suffix, int url) {
+ NoUnderlineClickableSpan clickableSpan =
new NoUnderlineClickableSpan(getContext(), (view1) -> {
if (!isAdded()) return;
- getPageDelegate().showInfoPage(R.string.google_privacy_policy_url);
+ getPageDelegate().showInfoPage(url);
});
- return new SpanInfo("<PRIVACY_LINK>", "</PRIVACY_LINK>", clickableFamilyLinkPrivacySpan);
- }
-
- private SpanInfo buildMetricsAndCrashReportingLink() {
- NoUnderlineClickableSpan clickableUMADialogSpan =
- new NoUnderlineClickableSpan(getContext(), (view1) -> openUmaDialog());
- return new SpanInfo("<UMA_LINK>", "</UMA_LINK>", clickableUMADialogSpan);
+ return new SpanInfo("<PRIVACY_LINK" + suffix + ">", "</PRIVACY_LINK" + suffix + ">", clickableSpan);
}
- private void updateTosText(boolean umaDialogMayBeShown, boolean hasChildAccount,
- boolean isMetricsReportingDisabledByPolicy) {
+ private void updateTosText() {
List<SpanInfo> spans = new LinkedList<SpanInfo>();
- // Description always has a Terms of Service link.
- spans.add(buildTermsOfServiceLink());
+ spans.add(buildPrivacyPolicyLink("1", R.string.adblock_wiki_url));
- // Additional terms of service link.
- if (!umaDialogMayBeShown) {
- spans.add(buildAdditionalTermsOfServiceLink());
- }
+ spans.add(buildPrivacyPolicyLink("2", R.string.adblock_updater_privacy_policy_url));
- // Privacy policy link.
- if (hasChildAccount) {
- spans.add(buildPrivacyPolicyLink());
- }
+ spans.add(buildPrivacyPolicyLink("3", R.string.auto_updates_wiki_url));
- // Metrics and crash reporting link.
- if (umaDialogMayBeShown && !isMetricsReportingDisabledByPolicy) {
- spans.add(buildMetricsAndCrashReportingLink());
- }
+ spans.add(buildPrivacyPolicyLink("4", R.string.bromite_updater_privacy_policy_url));
- String tosString;
- if (umaDialogMayBeShown) {
- tosString =
- getString(hasChildAccount ? R.string.signin_fre_footer_tos_with_supervised_user
- : R.string.signin_fre_footer_tos);
-
- if (!isMetricsReportingDisabledByPolicy) {
- tosString += "\n" + getString(R.string.signin_fre_footer_metrics_reporting);
- }
- } else {
- tosString = getString(hasChildAccount ? R.string.fre_tos_and_privacy_child_account
- : R.string.fre_tos);
- }
+ String tosString = getString(R.string.bromite_fre_footer_privacy_policy);
mTosAndPrivacy.setText(SpanApplier.applySpans(tosString, spans.toArray(new SpanInfo[0])));
}
- private void updateReportCheckbox(
- boolean umaDialogMayBeShown, boolean isMetricsReportingDisabledByPolicy) {
- // The user can only interact with the UMA checkbox after it's visible on the screen, in
- // which case a previous call to this method has already checked the checkbox expected
- // initial state.
- if (!mUserInteractedWithUmaCheckbox) {
- mAllowMetricsAndCrashUploading = getUmaCheckBoxInitialState();
- mSendReportCheckBox.setChecked(mAllowMetricsAndCrashUploading);
- }
-
- if (!canShowUmaCheckBox()) {
- if (!umaDialogMayBeShown) {
- mAllowMetricsAndCrashUploading =
- (sShowUmaCheckBoxForTesting || VersionInfo.isOfficialBuild())
- && !isMetricsReportingDisabledByPolicy;
- }
- mSendReportCheckBox.setVisibility(View.GONE);
- }
- }
-
- private void openUmaDialog() {
- new FreUMADialogCoordinator(requireContext(),
- ((ModalDialogManagerHolder) getActivity()).getModalDialogManager(), this,
- mAllowMetricsAndCrashUploading);
+ private void updateReportCheckbox() {
+ mAutoUpdaterCheckBox.setChecked(true);
}
private void onPolicyServiceInitialized(boolean onDevicePolicyFound) {
@@ -317,6 +239,12 @@ public class ToSAndUMAFirstRunFragment
private void onTosButtonClicked() {
mTosButtonClicked = true;
mTosAcceptedTime = SystemClock.elapsedRealtime();
+
+ // save updater configuration only on button click
+ SharedPreferences.Editor sharedPreferenceEditor = OmahaBase.getSharedPreferences().edit();
+ sharedPreferenceEditor.putBoolean(OmahaBase.PREF_ALLOW_INLINE_UPDATE, mAutoUpdaterChecked);
+ sharedPreferenceEditor.apply();
+
tryMarkTermsAccepted(true);
}
@@ -327,7 +255,8 @@ public class ToSAndUMAFirstRunFragment
* @param fromButtonClicked Whether called from {@link #onTosButtonClicked()}.
*/
private void tryMarkTermsAccepted(boolean fromButtonClicked) {
- if (!mTosButtonClicked || isWaitingForNativeAndPolicyInit()) {
+ boolean isW = isWaitingForNativeAndPolicyInit();
+ if (!mTosButtonClicked || isW) {
if (fromButtonClicked) setSpinnerVisible(true);
return;
}
@@ -338,7 +267,7 @@ public class ToSAndUMAFirstRunFragment
RecordHistogram.recordTimesHistogram("MobileFre.TosFragment.SpinnerVisibleDuration",
SystemClock.elapsedRealtime() - mTosAcceptedTime);
}
- getPageDelegate().acceptTermsOfService(mAllowMetricsAndCrashUploading);
+ getPageDelegate().acceptTermsOfService(false);
getPageDelegate().advanceToNextPage();
}
@@ -381,10 +310,7 @@ public class ToSAndUMAFirstRunFragment
mAcceptButton.setVisibility(visibility);
mTosAndPrivacy.setVisibility(visibility);
- // Avoid updating visibility if the UMA check box can't be shown right now.
- if (canShowUmaCheckBox()) {
- mSendReportCheckBox.setVisibility(visibility);
- }
+ mAutoUpdaterCheckBox.setVisibility(visibility);
}
protected View getToSAndPrivacyText() {
@@ -397,18 +323,6 @@ public class ToSAndUMAFirstRunFragment
}
}
- /**
- * @return Whether the check box for Uma metrics can be shown. It should be used in conjunction
- * with whether other non-spinner elements can generally be shown.
- */
- protected boolean canShowUmaCheckBox() {
- return !FREMobileIdentityConsistencyFieldTrial.shouldShowOldFreWithUmaDialog()
- && (sShowUmaCheckBoxForTesting || VersionInfo.isOfficialBuild())
- && (isWaitingForNativeAndPolicyInit()
- || PrivacyPreferencesManagerImpl.getInstance()
- .isUsageAndCrashReportingPermittedByPolicy());
- }
-
@VisibleForTesting
public static void setShowUmaCheckBoxForTesting(boolean showForTesting) {
sShowUmaCheckBoxForTesting = showForTesting;
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -3076,11 +3076,30 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<message name="IDS_LIGHTWEIGHT_FRE_ASSOCIATED_APP_TOS_AND_PRIVACY_CHILD_ACCOUNT" desc="Message explaining that use of Chrome is governed by Chrome's terms of service, and the Google Privacy Policy.">
@@ -3077,7 +3077,29 @@ To change this setting, <ph name="BEGIN_LINK">&lt;resetlink&gt;</ph>reset sync<p
<ph name="APP_NAME">%1$s<ex>Google Maps</ex></ph> will open in Chrome. By continuing, you agree to the <ph name="BEGIN_LINK1">&lt;LINK1&gt;</ph>Google Terms of Service<ph name="END_LINK1">&lt;/LINK1&gt;</ph>, and the <ph name="BEGIN_LINK2">&lt;LINK2&gt;</ph>Google Chrome and ChromeOS Additional Terms of Service<ph name="END_LINK2">&lt;/LINK2&gt;</ph>. The <ph name="BEGIN_LINK3">&lt;LINK3&gt;</ph>Privacy Policy<ph name="END_LINK3">&lt;/LINK3&gt;</ph> also applies.
</message>
- <message name="IDS_FRE_SEND_REPORT_CHECK" desc="Text for asking the user to allow sending stats and crash reports">
- Help make Chrome better by sending usage statistics and crash reports to Google.
- </message>
<message name="IDS_FRE_ACCEPT_CONTINUE" desc="Text for first page accept and continue button [CHAR_LIMIT=20]">
- Accept &amp; continue
+ Continue
build/patches/ungoogled-chromium-Disable-webRTC-log-uploader.patch
+39 -6
View File
@@ -4,13 +4,15 @@ Subject: ungoogled-chromium: Disable webRTC log uploader
License: GPL-3.0-only - https://spdx.org/licenses/GPL-3.0-only.html
---
.../media/webrtc/webrtc_log_uploader.cc | 28 ++++---------------
1 file changed, 6 insertions(+), 22 deletions(-)
.../media/webrtc/webrtc_log_uploader.cc | 36 ++++---------------
.../media/webrtc/webrtc_logging_controller.cc | 1 +
chrome/browser/ui/browser_ui_prefs.cc | 2 +-
3 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
@@ -126,28 +126,7 @@ void WebRtcLogUploader::LoggingStoppedDoUpload(
@@ -127,36 +127,7 @@ void WebRtcLogUploader::OnLoggingStopped(
DCHECK(meta_data.get());
DCHECK(!upload_done_data.paths.directory.empty());
@@ -34,13 +36,21 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
- }
-
- upload_done_data.local_log_id = local_log_id;
- PrepareMultipartPostData(compressed_log, std::move(meta_data),
- std::move(upload_done_data));
-
- if (is_text_log_upload_allowed) {
- PrepareMultipartPostData(compressed_log, std::move(meta_data),
- std::move(upload_done_data));
- } else {
- main_task_runner_->PostTask(
- FROM_HERE,
- base::BindOnce(&WebRtcLogUploader::NotifyUploadDisabled,
- base::Unretained(this), std::move(upload_done_data)));
- }
+ NotifyUploadDoneAndLogStats(net::HTTP_OK, net::OK, "", std::move(upload_done_data));
}
void WebRtcLogUploader::PrepareMultipartPostData(
@@ -158,6 +137,11 @@ void WebRtcLogUploader::PrepareMultipartPostData(
@@ -167,6 +138,11 @@ void WebRtcLogUploader::PrepareMultipartPostData(
DCHECK(!compressed_log.empty());
DCHECK(meta_data.get());
@@ -52,5 +62,28 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser
std::unique_ptr<std::string> post_data(new std::string());
SetupMultipart(post_data.get(), compressed_log,
upload_done_data.paths.incoming_rtp_dump,
diff --git a/chrome/browser/media/webrtc/webrtc_logging_controller.cc b/chrome/browser/media/webrtc/webrtc_logging_controller.cc
--- a/chrome/browser/media/webrtc/webrtc_logging_controller.cc
+++ b/chrome/browser/media/webrtc/webrtc_logging_controller.cc
@@ -603,6 +603,7 @@ content::BrowserContext* WebRtcLoggingController::GetBrowserContext() const {
// static
bool WebRtcLoggingController::IsWebRtcTextLogAllowed(
content::BrowserContext* browser_context) {
+ if ((true)) return false;
// Historically by default webrtc text logs are always uploaded.
if (!browser_context) {
return true;
diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
--- a/chrome/browser/ui/browser_ui_prefs.cc
+++ b/chrome/browser/ui/browser_ui_prefs.cc
@@ -96,7 +96,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
registry->RegisterBooleanPref(prefs::kWebRtcEventLogCollectionAllowed, false);
registry->RegisterListPref(prefs::kWebRtcLocalIpsAllowedUrls);
registry->RegisterBooleanPref(prefs::kWebRTCAllowLegacyTLSProtocols, false);
- registry->RegisterBooleanPref(prefs::kWebRtcTextLogCollectionAllowed, true);
+ registry->RegisterBooleanPref(prefs::kWebRtcTextLogCollectionAllowed, false);
// Dictionaries to keep track of default tasks in the file browser.
registry->RegisterDictionaryPref(
--
2.25.1