mirror of
https://github.com/morgan9e/helium
synced 2026-04-14 00:14:20 +09:00
Update to Chromium 126.0.6478.55
This commit is contained in:
@@ -1 +1 @@
|
||||
125.0.6422.141
|
||||
126.0.6478.55
|
||||
|
||||
@@ -66,6 +66,8 @@ These are also available on the `chrome://flags` page.
|
||||
`MinimalReferrers` | Removes all cross-origin referrers and strips same-origin referrers down to the origin. Has lower precedence than `NoCrossOriginReferrers`.
|
||||
`NoCrossOriginReferrers` | Removes all cross-origin referrers. Has lower precedence than `NoReferrers`.
|
||||
`NoReferrers` | Removes all referrers.
|
||||
`ReducedSystemInfo` | Reduces the amount of system information obatainable through headers and javascript, also causes hardwareConcurrency to respond with two cores.
|
||||
`RemoveClientHints` | Removes client hints (information sent to servers about your system, similar to a user agent).
|
||||
`SetIpv6ProbeFalse` | Forces the result of the browser's IPv6 probing (i.e. IPv6 connectivity test) to be unsuccessful. This causes IPv4 addresses to be prioritized over IPv6 addresses. Without this flag, the probing result is set to be successful, which causes IPv6 to be used over IPv4 when possible.
|
||||
|
||||
- ### Available only on desktop
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -10,7 +10,7 @@ Subject: Disable fetching of all field trials
|
||||
|
||||
--- 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
|
||||
@@ -51,7 +51,7 @@ public abstract class ChromeFeatureList
|
||||
@@ -52,7 +52,7 @@ public abstract class ChromeFeatureList
|
||||
* |kFeaturesExposedToJava| in chrome/browser/flags/android/chrome_feature_list.cc
|
||||
*/
|
||||
public static String getFieldTrialParamByFeature(String featureName, String paramName) {
|
||||
@@ -19,7 +19,7 @@ Subject: Disable fetching of all field trials
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -63,8 +63,7 @@ public abstract class ChromeFeatureList
|
||||
@@ -64,8 +64,7 @@ public abstract class ChromeFeatureList
|
||||
*/
|
||||
public static boolean getFieldTrialParamByFeatureAsBoolean(
|
||||
String featureName, String paramName, boolean defaultValue) {
|
||||
@@ -29,7 +29,7 @@ Subject: Disable fetching of all field trials
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -76,8 +75,7 @@ public abstract class ChromeFeatureList
|
||||
@@ -77,8 +76,7 @@ public abstract class ChromeFeatureList
|
||||
*/
|
||||
public static int getFieldTrialParamByFeatureAsInt(
|
||||
String featureName, String paramName, int defaultValue) {
|
||||
@@ -39,7 +39,7 @@ Subject: Disable fetching of all field trials
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -89,8 +87,7 @@ public abstract class ChromeFeatureList
|
||||
@@ -90,8 +88,7 @@ public abstract class ChromeFeatureList
|
||||
*/
|
||||
public static double getFieldTrialParamByFeatureAsDouble(
|
||||
String featureName, String paramName, double defaultValue) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2425,7 +2425,6 @@ static_library("browser") {
|
||||
@@ -2434,7 +2434,6 @@ static_library("browser") {
|
||||
"//components/reporting/util:task_runner_context",
|
||||
"//components/resources",
|
||||
"//components/safe_browsing/content/browser",
|
||||
@@ -8,7 +8,7 @@
|
||||
"//components/safe_browsing/content/browser:safe_browsing_service",
|
||||
"//components/safe_browsing/content/browser/password_protection",
|
||||
"//components/safe_browsing/content/browser/web_ui",
|
||||
@@ -3829,8 +3828,6 @@ static_library("browser") {
|
||||
@@ -3882,8 +3881,6 @@ static_library("browser") {
|
||||
"download/download_commands.h",
|
||||
"download/download_crx_util.cc",
|
||||
"download/download_crx_util.h",
|
||||
@@ -30,7 +30,7 @@
|
||||
namespace subresource_filter {
|
||||
class RulesetService;
|
||||
}
|
||||
@@ -222,9 +218,6 @@ class BrowserProcess {
|
||||
@@ -223,9 +219,6 @@ class BrowserProcess {
|
||||
// on this platform (or this is a unit test).
|
||||
virtual StatusTray* status_tray() = 0;
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
virtual subresource_filter::RulesetService*
|
||||
--- a/chrome/browser/browser_process_impl.cc
|
||||
+++ b/chrome/browser/browser_process_impl.cc
|
||||
@@ -75,7 +75,6 @@
|
||||
@@ -76,7 +76,6 @@
|
||||
#include "chrome/browser/printing/print_job_manager.h"
|
||||
#include "chrome/browser/profiles/profile_manager.h"
|
||||
#include "chrome/browser/resource_coordinator/resource_coordinator_parts.h"
|
||||
@@ -50,7 +50,7 @@
|
||||
#include "chrome/browser/shell_integration.h"
|
||||
#include "chrome/browser/site_isolation/prefs_observer.h"
|
||||
#include "chrome/browser/ssl/secure_origin_prefs_observer.h"
|
||||
@@ -452,8 +451,6 @@ void BrowserProcessImpl::StartTearDown()
|
||||
@@ -458,8 +457,6 @@ void BrowserProcessImpl::StartTearDown()
|
||||
#endif
|
||||
metrics_services_manager_.reset();
|
||||
intranet_redirect_detector_.reset();
|
||||
@@ -59,7 +59,7 @@
|
||||
network_time_tracker_.reset();
|
||||
|
||||
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
|
||||
@@ -1122,14 +1119,6 @@ StatusTray* BrowserProcessImpl::status_t
|
||||
@@ -1138,14 +1135,6 @@ StatusTray* BrowserProcessImpl::status_t
|
||||
return status_tray_.get();
|
||||
}
|
||||
|
||||
@@ -74,7 +74,7 @@
|
||||
subresource_filter::RulesetService*
|
||||
BrowserProcessImpl::subresource_filter_ruleset_service() {
|
||||
DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
|
||||
@@ -1429,26 +1418,6 @@ void BrowserProcessImpl::CreateBackgroun
|
||||
@@ -1453,26 +1442,6 @@ void BrowserProcessImpl::CreateBackgroun
|
||||
#endif
|
||||
}
|
||||
|
||||
@@ -90,8 +90,8 @@
|
||||
- safe_browsing::GetSafeBrowsingServiceFactory());
|
||||
- }
|
||||
-
|
||||
- // TODO(crbug/925153): Port consumers of the |safe_browsing_service_| to use
|
||||
- // the interface in components/safe_browsing, and remove this cast.
|
||||
- // TODO(crbug.com/41437292): Port consumers of the |safe_browsing_service_| to
|
||||
- // use the interface in components/safe_browsing, and remove this cast.
|
||||
- safe_browsing_service_ = static_cast<safe_browsing::SafeBrowsingService*>(
|
||||
- safe_browsing::SafeBrowsingServiceInterface::CreateSafeBrowsingService());
|
||||
- if (safe_browsing_service_)
|
||||
@@ -103,7 +103,7 @@
|
||||
created_subresource_filter_ruleset_service_ = true;
|
||||
--- a/chrome/browser/browser_process_impl.h
|
||||
+++ b/chrome/browser/browser_process_impl.h
|
||||
@@ -197,7 +197,6 @@ class BrowserProcessImpl : public Browse
|
||||
@@ -200,7 +200,6 @@ class BrowserProcessImpl : public Browse
|
||||
std::unique_ptr<BackgroundModeManager> manager) override;
|
||||
#endif
|
||||
StatusTray* status_tray() override;
|
||||
@@ -111,7 +111,7 @@
|
||||
subresource_filter::RulesetService* subresource_filter_ruleset_service()
|
||||
override;
|
||||
subresource_filter::RulesetService*
|
||||
@@ -360,9 +359,6 @@ class BrowserProcessImpl : public Browse
|
||||
@@ -367,9 +366,6 @@ class BrowserProcessImpl : public Browse
|
||||
std::unique_ptr<BackgroundModeManager> background_mode_manager_;
|
||||
#endif
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
subresource_filter_ruleset_service_;
|
||||
--- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
+++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc
|
||||
@@ -68,7 +68,6 @@
|
||||
@@ -69,7 +69,6 @@
|
||||
#include "chrome/browser/profiles/keep_alive/scoped_profile_keep_alive.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
#include "chrome/browser/reading_list/reading_list_model_factory.h"
|
||||
@@ -131,7 +131,7 @@
|
||||
#include "chrome/browser/safe_browsing/verdict_cache_manager_factory.h"
|
||||
#include "chrome/browser/search_engines/template_url_service_factory.h"
|
||||
#include "chrome/browser/share/share_history.h"
|
||||
@@ -641,10 +640,6 @@ void ChromeBrowsingDataRemoverDelegate::
|
||||
@@ -643,10 +642,6 @@ void ChromeBrowsingDataRemoverDelegate::
|
||||
base::RecordAction(UserMetricsAction("ClearBrowsingData_Cookies"));
|
||||
|
||||
network::mojom::NetworkContext* safe_browsing_context = nullptr;
|
||||
@@ -144,7 +144,7 @@
|
||||
browsing_data::RemoveFederatedSiteSettingsData(delete_begin_, delete_end_,
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -5169,10 +5169,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
@@ -5187,10 +5187,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
throttles.push_back(std::make_unique<PolicyBlocklistNavigationThrottle>(
|
||||
handle, handle->GetWebContents()->GetBrowserContext()));
|
||||
|
||||
@@ -155,7 +155,7 @@
|
||||
throttles.push_back(std::make_unique<SSLErrorNavigationThrottle>(
|
||||
handle,
|
||||
base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp),
|
||||
@@ -5224,16 +5220,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
@@ -5242,16 +5238,6 @@ ChromeContentBrowserClient::CreateThrott
|
||||
&throttles);
|
||||
#endif
|
||||
|
||||
@@ -172,7 +172,7 @@
|
||||
if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) {
|
||||
throttles.push_back(
|
||||
std::make_unique<safe_browsing::DelayedWarningNavigationThrottle>(
|
||||
@@ -5534,8 +5520,6 @@ bool ChromeContentBrowserClient::IsPlugi
|
||||
@@ -5569,8 +5555,6 @@ bool ChromeContentBrowserClient::IsPlugi
|
||||
void ChromeContentBrowserClient::InitOnUIThread() {
|
||||
DCHECK_CURRENTLY_ON(BrowserThread::UI);
|
||||
|
||||
@@ -221,7 +221,7 @@
|
||||
if (download_manager_) {
|
||||
download_manager_->AddObserver(this);
|
||||
}
|
||||
@@ -933,17 +926,6 @@ void ChromeDownloadManagerDelegate::Choo
|
||||
@@ -940,17 +933,6 @@ void ChromeDownloadManagerDelegate::Choo
|
||||
void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName(
|
||||
base::FilePath* filename,
|
||||
const GURL& source_url) {
|
||||
@@ -250,7 +250,7 @@
|
||||
|
||||
// Whether the download is currently being revived.
|
||||
bool is_being_revived_ = false;
|
||||
@@ -535,13 +535,13 @@ void DownloadItemModel::SetShouldPreferO
|
||||
@@ -536,13 +536,13 @@ void DownloadItemModel::SetShouldPreferO
|
||||
data->should_prefer_opening_in_browser_ = preference;
|
||||
}
|
||||
|
||||
@@ -267,7 +267,7 @@
|
||||
DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_);
|
||||
data->danger_level_ = danger_level;
|
||||
}
|
||||
@@ -748,9 +748,6 @@ bool DownloadItemModel::IsCommandEnabled
|
||||
@@ -749,9 +749,6 @@ bool DownloadItemModel::IsCommandEnabled
|
||||
// filename. Don't base an "Always open" decision based on it. Also
|
||||
// exclude extensions.
|
||||
return download_->CanOpenDownload() &&
|
||||
@@ -279,7 +279,7 @@
|
||||
return !download_->IsSavePackageDownload() &&
|
||||
--- a/chrome/browser/download/download_prefs.cc
|
||||
+++ b/chrome/browser/download/download_prefs.cc
|
||||
@@ -263,14 +263,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
|
||||
@@ -261,14 +261,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
|
||||
base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) +
|
||||
extension);
|
||||
|
||||
@@ -295,7 +295,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -448,10 +441,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
|
||||
@@ -444,10 +437,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c
|
||||
bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension(
|
||||
const base::FilePath& file_name) {
|
||||
base::FilePath::StringType extension = file_name.Extension();
|
||||
@@ -308,7 +308,7 @@
|
||||
extension.erase(0, 1);
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -324,13 +324,6 @@ base::FilePath DownloadTargetDeterminer:
|
||||
@@ -323,13 +323,6 @@ base::FilePath DownloadTargetDeterminer:
|
||||
download_->GetURL(), download_->GetContentDisposition(), referrer_charset,
|
||||
suggested_filename, sniffed_mime_type, default_filename);
|
||||
|
||||
@@ -322,7 +322,7 @@
|
||||
// If no mime type or explicitly specified a name, don't replace file
|
||||
// extension.
|
||||
if (sniffed_mime_type.empty() || !suggested_filename.empty())
|
||||
@@ -1291,30 +1284,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
@@ -1290,30 +1283,7 @@ DownloadFileType::DangerLevel DownloadTa
|
||||
download_->HasUserGesture())
|
||||
return DownloadFileType::NOT_DANGEROUS;
|
||||
|
||||
@@ -500,7 +500,7 @@
|
||||
referrer_entries)));
|
||||
--- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
+++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc
|
||||
@@ -692,18 +692,6 @@ void WebstorePrivateBeginInstallWithMani
|
||||
@@ -697,18 +697,6 @@ void WebstorePrivateBeginInstallWithMani
|
||||
|
||||
void WebstorePrivateBeginInstallWithManifest3Function::
|
||||
ReportFrictionAcceptedEvent() {
|
||||
@@ -519,7 +519,7 @@
|
||||
}
|
||||
|
||||
void WebstorePrivateBeginInstallWithManifest3Function::OnInstallPromptDone(
|
||||
@@ -1202,54 +1190,9 @@ WebstorePrivateGetReferrerChainFunction:
|
||||
@@ -1207,54 +1195,9 @@ WebstorePrivateGetReferrerChainFunction:
|
||||
|
||||
ExtensionFunction::ResponseAction
|
||||
WebstorePrivateGetReferrerChainFunction::Run() {
|
||||
@@ -647,7 +647,7 @@
|
||||
// SimpleURLLoader -> (owned loader, extension id).
|
||||
--- a/chrome/browser/profiles/profile_impl.cc
|
||||
+++ b/chrome/browser/profiles/profile_impl.cc
|
||||
@@ -92,7 +92,6 @@
|
||||
@@ -91,7 +91,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"
|
||||
@@ -655,7 +655,7 @@
|
||||
#include "chrome/browser/sessions/exit_type_service.h"
|
||||
#include "chrome/browser/sharing/sharing_service_factory.h"
|
||||
#include "chrome/browser/signin/identity_manager_factory.h"
|
||||
@@ -640,17 +639,6 @@ void ProfileImpl::LoadPrefsForNormalStar
|
||||
@@ -639,17 +638,6 @@ void ProfileImpl::LoadPrefsForNormalStar
|
||||
|
||||
mojo::PendingRemote<prefs::mojom::TrackedPreferenceValidationDelegate>
|
||||
pref_validation_delegate;
|
||||
@@ -695,7 +695,7 @@
|
||||
sources = [
|
||||
"chrome_controller_client.cc",
|
||||
"chrome_controller_client.h",
|
||||
@@ -69,6 +70,7 @@ static_library("safe_browsing") {
|
||||
@@ -70,6 +71,7 @@ static_library("safe_browsing") {
|
||||
"//mojo/public/cpp/system",
|
||||
"//services/preferences/public/cpp",
|
||||
]
|
||||
@@ -703,7 +703,7 @@
|
||||
|
||||
if (is_android) {
|
||||
deps += [ "//chrome/browser/password_manager/android:utils" ]
|
||||
@@ -506,6 +508,7 @@ static_library("advanced_protection") {
|
||||
@@ -512,6 +514,7 @@ static_library("advanced_protection") {
|
||||
}
|
||||
|
||||
source_set("metrics_collector") {
|
||||
@@ -711,7 +711,7 @@
|
||||
sources = [
|
||||
"safe_browsing_metrics_collector_factory.cc",
|
||||
"safe_browsing_metrics_collector_factory.h",
|
||||
@@ -525,6 +528,7 @@ source_set("metrics_collector") {
|
||||
@@ -531,6 +534,7 @@ source_set("metrics_collector") {
|
||||
"//components/safe_browsing/core/common:safe_browsing_prefs",
|
||||
"//content/public/browser",
|
||||
]
|
||||
@@ -817,7 +817,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -5327,7 +5327,6 @@ static_library("ui") {
|
||||
@@ -5390,7 +5390,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",
|
||||
@@ -827,7 +827,7 @@
|
||||
"views/download/download_item_view.cc",
|
||||
--- a/chrome/browser/ui/tab_helpers.cc
|
||||
+++ b/chrome/browser/ui/tab_helpers.cc
|
||||
@@ -486,22 +486,6 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
@@ -501,22 +501,6 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
// See https://crbug.com/910288.
|
||||
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
|
||||
web_contents);
|
||||
@@ -852,7 +852,7 @@
|
||||
SecurityStateTabHelper::CreateForWebContents(web_contents);
|
||||
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
|
||||
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.cc
|
||||
@@ -25,7 +25,6 @@
|
||||
@@ -26,7 +26,6 @@
|
||||
#include "base/values.h"
|
||||
#include "chrome/browser/browser_process.h"
|
||||
#include "chrome/browser/download/bubble/download_bubble_ui_controller.h"
|
||||
@@ -860,7 +860,7 @@
|
||||
#include "chrome/browser/download/download_history.h"
|
||||
#include "chrome/browser/download/download_item_model.h"
|
||||
#include "chrome/browser/download/download_item_warning_data.h"
|
||||
@@ -287,13 +286,6 @@ void DownloadsDOMHandler::SaveDangerousR
|
||||
@@ -292,13 +291,6 @@ void DownloadsDOMHandler::SaveDangerousR
|
||||
}
|
||||
|
||||
CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS);
|
||||
@@ -874,7 +874,7 @@
|
||||
}
|
||||
|
||||
// "Suspicious" in this context applies to insecure as well as dangerous
|
||||
@@ -558,12 +550,6 @@ void DownloadsDOMHandler::RemoveDownload
|
||||
@@ -569,12 +561,6 @@ void DownloadsDOMHandler::RemoveDownload
|
||||
IdSet ids;
|
||||
|
||||
for (download::DownloadItem* download : to_remove) {
|
||||
@@ -887,7 +887,7 @@
|
||||
DownloadItemModel item_model(download);
|
||||
if (!item_model.ShouldShowInShelf() ||
|
||||
download->GetState() == download::DownloadItem::IN_PROGRESS) {
|
||||
@@ -723,54 +709,6 @@ void DownloadsDOMHandler::FinalizeRemova
|
||||
@@ -783,54 +769,6 @@ void DownloadsDOMHandler::FinalizeRemova
|
||||
}
|
||||
}
|
||||
|
||||
@@ -939,9 +939,9 @@
|
||||
- item->ValidateDangerousDownload();
|
||||
-}
|
||||
-
|
||||
bool DownloadsDOMHandler::IsDeletingHistoryAllowed() {
|
||||
content::DownloadManager* manager = GetMainNotifierManager();
|
||||
return manager && Profile::FromBrowserContext(manager->GetBrowserContext())
|
||||
void DownloadsDOMHandler::MaybeTriggerDownloadWarningHatsSurvey(
|
||||
download::DownloadItem* item,
|
||||
DownloadWarningHatsType survey_type) {
|
||||
--- a/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
|
||||
+++ b/chrome/browser/ui/webui/downloads/downloads_dom_handler.h
|
||||
@@ -12,7 +12,6 @@
|
||||
@@ -949,10 +949,10 @@
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/memory/weak_ptr.h"
|
||||
-#include "chrome/browser/download/download_danger_prompt.h"
|
||||
#include "chrome/browser/download/download_warning_desktop_hats_utils.h"
|
||||
#include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h"
|
||||
#include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h"
|
||||
#include "content/public/browser/web_contents_observer.h"
|
||||
@@ -104,18 +103,6 @@ class DownloadsDOMHandler : public conte
|
||||
@@ -120,18 +119,6 @@ class DownloadsDOMHandler : public conte
|
||||
// null-checking |original_notifier_|.
|
||||
content::DownloadManager* GetOriginalNotifierManager() const;
|
||||
|
||||
@@ -968,9 +968,9 @@
|
||||
- // DownloadItem.
|
||||
- void DangerPromptDone(int download_id, DownloadDangerPrompt::Action action);
|
||||
-
|
||||
// Returns true if the records of any downloaded items are allowed (and able)
|
||||
// to be deleted.
|
||||
bool IsDeletingHistoryAllowed();
|
||||
// Launches a HaTS survey for a download warning that is heeded, bypassed, or
|
||||
// ignored (if all preconditions are met).
|
||||
void MaybeTriggerDownloadWarningHatsSurvey(
|
||||
--- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
||||
+++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc
|
||||
@@ -275,69 +275,6 @@ CreateHttpsOnlyModePage(content::WebCont
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
extension_misc::kAssessmentAssistantExtensionId,
|
||||
--- a/chrome/browser/extensions/component_loader.cc
|
||||
+++ b/chrome/browser/extensions/component_loader.cc
|
||||
@@ -397,11 +397,6 @@ void ComponentLoader::AddWebStoreApp() {
|
||||
@@ -410,11 +410,6 @@ void ComponentLoader::AddWebStoreApp() {
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
@@ -112,7 +112,7 @@ by default.
|
||||
scoped_refptr<base::SequencedTaskRunner> task_runner)
|
||||
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
|
||||
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
|
||||
@@ -525,7 +525,7 @@ void WebRtcLogUploader::UploadCompressed
|
||||
@@ -528,7 +528,7 @@ void WebRtcLogUploader::UploadCompressed
|
||||
}
|
||||
})");
|
||||
|
||||
@@ -285,14 +285,14 @@ by default.
|
||||
|
||||
--- a/components/google/core/common/google_util.cc
|
||||
+++ b/components/google/core/common/google_util.cc
|
||||
@@ -139,7 +139,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
|
||||
@@ -140,7 +140,7 @@ bool IsGoogleSearchSubdomainUrl(const GU
|
||||
|
||||
// Global functions -----------------------------------------------------------
|
||||
|
||||
-const char kGoogleHomepageURL[] = "https://www.google.com/";
|
||||
+const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
|
||||
|
||||
bool HasGoogleSearchQueryParam(base::StringPiece str) {
|
||||
bool HasGoogleSearchQueryParam(std::string_view str) {
|
||||
url::Component query(0, static_cast<int>(str.length())), key, value;
|
||||
--- a/components/history/core/browser/web_history_service.cc
|
||||
+++ b/components/history/core/browser/web_history_service.cc
|
||||
|
||||
@@ -67,7 +67,7 @@ the URL so we get notified if this happens again in the future).
|
||||
}
|
||||
--- a/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
|
||||
+++ b/components/security_interstitials/core/safe_browsing_loud_error_ui.cc
|
||||
@@ -26,11 +26,11 @@ namespace {
|
||||
@@ -27,11 +27,11 @@ namespace {
|
||||
// For malware interstitial pages, we link the problematic URL to Google's
|
||||
// diagnostic page.
|
||||
const char kSbDiagnosticUrl[] =
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
# Dev tools attempts to download css data
|
||||
--- a/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
|
||||
+++ b/chrome/browser/new_tab_page/one_google_bar/one_google_bar_loader_impl.cc
|
||||
@@ -287,6 +287,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
|
||||
@@ -289,6 +289,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad
|
||||
OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default;
|
||||
|
||||
void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) {
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
url.SchemeIs(dom_distiller::kDomDistillerScheme))
|
||||
--- a/chrome/browser/ui/singleton_tabs.cc
|
||||
+++ b/chrome/browser/ui/singleton_tabs.cc
|
||||
@@ -170,7 +170,8 @@ int GetIndexOfExistingTab(Browser* brows
|
||||
@@ -165,7 +165,8 @@ int GetIndexOfExistingTab(Browser* brows
|
||||
// RewriteURLIfNecessary removes the "view-source:" scheme which could lead
|
||||
// to incorrect matching, so ensure that the target and the candidate are
|
||||
// either both view-source:, or neither is.
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
--- a/components/omnibox/browser/autocomplete_input.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_input.cc
|
||||
@@ -581,7 +581,8 @@ void AutocompleteInput::ParseForEmphasiz
|
||||
@@ -582,7 +582,8 @@ void AutocompleteInput::ParseForEmphasiz
|
||||
// For the view-source and blob schemes, we should emphasize the host of the
|
||||
// URL qualified by the view-source or blob prefix.
|
||||
if ((base::EqualsCaseInsensitiveASCII(scheme_str, kViewSourceScheme) ||
|
||||
@@ -47,7 +47,7 @@
|
||||
std::u16string real_url(text.substr(after_scheme_and_colon));
|
||||
--- a/components/url_formatter/url_fixer.cc
|
||||
+++ b/components/url_formatter/url_fixer.cc
|
||||
@@ -576,6 +576,10 @@ GURL FixupURLInternal(const std::string&
|
||||
@@ -575,6 +575,10 @@ GURL FixupURLInternal(const std::string&
|
||||
}
|
||||
}
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
return GURL(parts.scheme.is_valid() ? text : FixupPath(text));
|
||||
--- a/content/browser/child_process_security_policy_impl.cc
|
||||
+++ b/content/browser/child_process_security_policy_impl.cc
|
||||
@@ -825,6 +825,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
|
||||
@@ -840,6 +840,7 @@ ChildProcessSecurityPolicyImpl::ChildPro
|
||||
RegisterWebSafeScheme(url::kWssScheme);
|
||||
#endif // BUILDFLAG(ENABLE_WEBSOCKETS)
|
||||
RegisterWebSafeScheme(url::kDataScheme);
|
||||
@@ -158,7 +158,7 @@
|
||||
|
||||
namespace net {
|
||||
|
||||
@@ -591,6 +593,12 @@ URLRequest::URLRequest(base::PassKey<URL
|
||||
@@ -602,6 +604,12 @@ URLRequest::URLRequest(base::PassKey<URL
|
||||
// Sanity check out environment.
|
||||
DCHECK(base::SingleThreadTaskRunner::HasCurrentDefault());
|
||||
|
||||
@@ -181,7 +181,7 @@
|
||||
#include "net/url_request/url_request_context.h"
|
||||
#include "net/url_request/url_request_job_factory.h"
|
||||
#include "url/url_constants.h"
|
||||
@@ -577,6 +578,9 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
@@ -584,6 +585,9 @@ std::unique_ptr<URLRequestContext> URLRe
|
||||
}
|
||||
protocol_handlers_.clear();
|
||||
|
||||
@@ -193,7 +193,7 @@
|
||||
if (cookie_deprecation_label_.has_value()) {
|
||||
--- a/url/url_constants.h
|
||||
+++ b/url/url_constants.h
|
||||
@@ -45,6 +45,8 @@ inline constexpr char kMailToScheme[] =
|
||||
@@ -47,6 +47,8 @@ inline constexpr char kMailToScheme[] =
|
||||
inline constexpr char16_t kMailToScheme16[] = u"mailto";
|
||||
inline constexpr char kTelScheme[] = "tel";
|
||||
inline constexpr char16_t kTelScheme16[] = u"tel";
|
||||
@@ -204,7 +204,7 @@
|
||||
inline constexpr char kUuidInPackageScheme[] = "uuid-in-package";
|
||||
--- a/url/url_util.cc
|
||||
+++ b/url/url_util.cc
|
||||
@@ -78,6 +78,7 @@ struct SchemeRegistry {
|
||||
@@ -79,6 +79,7 @@ struct SchemeRegistry {
|
||||
kWssScheme,
|
||||
kDataScheme,
|
||||
kAboutScheme,
|
||||
@@ -212,7 +212,7 @@
|
||||
};
|
||||
|
||||
// Schemes that normal pages cannot link to or access (i.e., with the same
|
||||
@@ -92,6 +93,7 @@ struct SchemeRegistry {
|
||||
@@ -93,6 +94,7 @@ struct SchemeRegistry {
|
||||
kAboutScheme,
|
||||
kJavaScriptScheme,
|
||||
kDataScheme,
|
||||
|
||||
58
patches/core/ungoogled-chromium/build-without-webnn.patch
Normal file
58
patches/core/ungoogled-chromium/build-without-webnn.patch
Normal file
@@ -0,0 +1,58 @@
|
||||
--- a/components/viz/service/BUILD.gn
|
||||
+++ b/components/viz/service/BUILD.gn
|
||||
@@ -284,7 +284,6 @@ viz_component("service") {
|
||||
"//services/metrics/public/mojom",
|
||||
"//services/tracing/public/cpp:cpp",
|
||||
"//services/viz/privileged/mojom",
|
||||
- "//services/webnn:webnn_service",
|
||||
"//skia",
|
||||
"//skia:skcms",
|
||||
"//third_party/libyuv",
|
||||
--- a/components/viz/service/gl/gpu_service_impl.cc
|
||||
+++ b/components/viz/service/gl/gpu_service_impl.cc
|
||||
@@ -902,15 +902,6 @@ void GpuServiceImpl::BindClientGmbInterf
|
||||
void GpuServiceImpl::BindWebNNContextProvider(
|
||||
mojo::PendingReceiver<webnn::mojom::WebNNContextProvider> pending_receiver,
|
||||
int client_id) {
|
||||
- if (!main_runner_->BelongsToCurrentThread()) {
|
||||
- main_runner_->PostTask(
|
||||
- FROM_HERE,
|
||||
- base::BindOnce(&GpuServiceImpl::BindWebNNContextProvider, weak_ptr_,
|
||||
- std::move(pending_receiver), client_id));
|
||||
- return;
|
||||
- }
|
||||
- webnn::WebNNContextProviderImpl::Create(std::move(pending_receiver),
|
||||
- GetContextState(), gpu_feature_info_);
|
||||
}
|
||||
#endif // !BUILDFLAG(IS_CHROMEOS)
|
||||
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -229,7 +229,6 @@ source_set("browser") {
|
||||
"//services/viz/privileged/mojom",
|
||||
"//services/viz/public/cpp/gpu",
|
||||
"//services/viz/public/mojom",
|
||||
- "//services/webnn:webnn_service",
|
||||
"//services/webnn:webnn_switches",
|
||||
"//skia",
|
||||
"//skia/public/mojom",
|
||||
--- a/content/gpu/BUILD.gn
|
||||
+++ b/content/gpu/BUILD.gn
|
||||
@@ -75,7 +75,6 @@ target(link_target_type, "gpu_sources")
|
||||
"//services/service_manager/public/mojom",
|
||||
"//services/tracing/public/cpp",
|
||||
"//services/viz/privileged/mojom",
|
||||
- "//services/webnn:webnn_service",
|
||||
"//services/webnn/public/mojom",
|
||||
"//skia",
|
||||
"//third_party/angle:angle_gpu_info_util",
|
||||
--- a/services/BUILD.gn
|
||||
+++ b/services/BUILD.gn
|
||||
@@ -58,7 +58,6 @@ test("services_unittests") {
|
||||
"//services/viz/public/cpp/compositing:tests",
|
||||
"//services/viz/public/cpp/gpu:tests",
|
||||
"//services/viz/public/cpp/hit_test:tests",
|
||||
- "//services/webnn:tests",
|
||||
]
|
||||
if (is_ios) {
|
||||
bundle_deps =
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -2548,24 +2548,6 @@ void ChromeContentBrowserClient::AppendE
|
||||
@@ -2550,24 +2550,6 @@ void ChromeContentBrowserClient::AppendE
|
||||
command_line->AppendSwitchASCII(switches::kMetricsClientID,
|
||||
client_info->client_id);
|
||||
}
|
||||
@@ -44,18 +44,18 @@
|
||||
const base::FilePath& exe_path,
|
||||
--- a/components/gwp_asan/client/gwp_asan.cc
|
||||
+++ b/components/gwp_asan/client/gwp_asan.cc
|
||||
@@ -241,6 +241,11 @@ bool IsMutuallyExclusiveFeatureAllowed(c
|
||||
@@ -321,6 +321,11 @@ GWP_ASAN_EXPORT std::optional<AllocatorS
|
||||
|
||||
// Exported for testing.
|
||||
GWP_ASAN_EXPORT std::optional<AllocatorSettings> GetAllocatorSettings(
|
||||
+ const base::Feature& a, bool b) {
|
||||
+ const base::Feature& a, bool b, std::string_view c) {
|
||||
+ return std::nullopt;
|
||||
+}
|
||||
+[[maybe_unused]]
|
||||
+std::optional<AllocatorSettings> DeadGetAllocatorSettings(
|
||||
const base::Feature& feature,
|
||||
bool boost_sampling) {
|
||||
if (!base::FeatureList::IsEnabled(feature))
|
||||
bool boost_sampling,
|
||||
std::string_view process_type) {
|
||||
--- a/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
|
||||
+++ b/third_party/crashpad/crashpad/client/crashpad_client_linux.cc
|
||||
@@ -748,8 +748,6 @@ void CrashpadClient::CrashWithoutDump(co
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
|
||||
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
|
||||
@@ -291,7 +291,7 @@ bool DomDistillerViewerSource::ShouldSer
|
||||
@@ -292,7 +292,7 @@ bool DomDistillerViewerSource::ShouldSer
|
||||
std::string DomDistillerViewerSource::GetContentSecurityPolicy(
|
||||
network::mojom::CSPDirectiveName directive) {
|
||||
if (directive == network::mojom::CSPDirectiveName::StyleSrc) {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/components/gcm_driver/gcm_client_impl.cc
|
||||
+++ b/components/gcm_driver/gcm_client_impl.cc
|
||||
@@ -448,6 +448,7 @@ void GCMClientImpl::StartGCM() {
|
||||
@@ -449,6 +449,7 @@ void GCMClientImpl::StartGCM() {
|
||||
|
||||
void GCMClientImpl::InitializeMCSClient() {
|
||||
DCHECK(network_connection_tracker_);
|
||||
@@ -10,7 +10,7 @@
|
||||
std::vector<GURL> endpoints;
|
||||
endpoints.push_back(gservices_settings_.GetMCSMainEndpoint());
|
||||
GURL fallback_endpoint = gservices_settings_.GetMCSFallbackEndpoint();
|
||||
@@ -652,28 +653,6 @@ void GCMClientImpl::RemoveHeartbeatInter
|
||||
@@ -653,28 +654,6 @@ void GCMClientImpl::RemoveHeartbeatInter
|
||||
|
||||
void GCMClientImpl::StartCheckin() {
|
||||
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
|
||||
@@ -39,7 +39,7 @@
|
||||
}
|
||||
|
||||
void GCMClientImpl::OnCheckinCompleted(
|
||||
@@ -730,24 +709,6 @@ void GCMClientImpl::SetGServicesSettings
|
||||
@@ -731,24 +710,6 @@ void GCMClientImpl::SetGServicesSettings
|
||||
|
||||
void GCMClientImpl::SchedulePeriodicCheckin() {
|
||||
DCHECK(io_task_runner_->RunsTasksInCurrentSequence());
|
||||
|
||||
@@ -190,16 +190,16 @@
|
||||
#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
|
||||
--- a/components/google/core/common/google_util.cc
|
||||
+++ b/components/google/core/common/google_util.cc
|
||||
@@ -31,110 +31,6 @@ namespace google_util {
|
||||
@@ -31,111 +31,6 @@ namespace google_util {
|
||||
|
||||
namespace {
|
||||
|
||||
-bool IsPathHomePageBase(base::StringPiece path) {
|
||||
-bool IsPathHomePageBase(std::string_view path) {
|
||||
- return (path == "/") || (path == "/webhp");
|
||||
-}
|
||||
-
|
||||
-// Removes a single trailing dot if present in |host|.
|
||||
-void StripTrailingDot(base::StringPiece* host) {
|
||||
-void StripTrailingDot(std::string_view* host) {
|
||||
- if (base::EndsWith(*host, "."))
|
||||
- host->remove_suffix(1);
|
||||
-}
|
||||
@@ -209,13 +209,14 @@
|
||||
-// ALLOW_SUBDOMAIN, we check against host "*.<domain_in_lower_case>.<TLD>"
|
||||
-// instead.
|
||||
-template <typename Container>
|
||||
-bool IsValidHostName(base::StringPiece host,
|
||||
- base::StringPiece domain_in_lower_case,
|
||||
-bool IsValidHostName(std::string_view host,
|
||||
- std::string_view domain_in_lower_case,
|
||||
- SubdomainPermission subdomain_permission,
|
||||
- const Container& allowed_tlds) {
|
||||
- // Fast path to avoid searching the registry set.
|
||||
- if (host.find(domain_in_lower_case) == base::StringPiece::npos)
|
||||
- if (host.find(domain_in_lower_case) == std::string_view::npos) {
|
||||
- return false;
|
||||
- }
|
||||
-
|
||||
- size_t tld_length =
|
||||
- net::registry_controlled_domains::GetCanonicalHostRegistryLength(
|
||||
@@ -225,10 +226,10 @@
|
||||
- return false;
|
||||
-
|
||||
- // Removes the tld and the preceding dot.
|
||||
- base::StringPiece host_minus_tld =
|
||||
- std::string_view host_minus_tld =
|
||||
- host.substr(0, host.length() - tld_length - 1);
|
||||
-
|
||||
- base::StringPiece tld = host.substr(host.length() - tld_length);
|
||||
- std::string_view tld = host.substr(host.length() - tld_length);
|
||||
- // Remove the trailing dot from tld if present, as for Google domains it's the
|
||||
- // same page.
|
||||
- StripTrailingDot(&tld);
|
||||
@@ -260,22 +261,22 @@
|
||||
- (port_permission == ALLOW_NON_STANDARD_PORTS));
|
||||
-}
|
||||
-
|
||||
-bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host,
|
||||
-bool IsCanonicalHostGoogleHostname(std::string_view canonical_host,
|
||||
- SubdomainPermission subdomain_permission) {
|
||||
- const GURL& base_url(CommandLineGoogleBaseURL());
|
||||
- if (base_url.is_valid() && (canonical_host == base_url.host_piece()))
|
||||
- return true;
|
||||
-
|
||||
- static constexpr auto google_tlds =
|
||||
- base::MakeFixedFlatSet<base::StringPiece>({GOOGLE_TLD_LIST});
|
||||
- base::MakeFixedFlatSet<std::string_view>({GOOGLE_TLD_LIST});
|
||||
- return IsValidHostName(canonical_host, "google", subdomain_permission,
|
||||
- google_tlds);
|
||||
-}
|
||||
-
|
||||
-bool IsCanonicalHostYoutubeHostname(base::StringPiece canonical_host,
|
||||
-bool IsCanonicalHostYoutubeHostname(std::string_view canonical_host,
|
||||
- SubdomainPermission subdomain_permission) {
|
||||
- static constexpr auto youtube_tlds =
|
||||
- base::MakeFixedFlatSet<base::StringPiece>({YOUTUBE_TLD_LIST});
|
||||
- base::MakeFixedFlatSet<std::string_view>({YOUTUBE_TLD_LIST});
|
||||
-
|
||||
- return IsValidHostName(canonical_host, "youtube", subdomain_permission,
|
||||
- youtube_tlds);
|
||||
@@ -288,11 +289,11 @@
|
||||
- if (!IsValidURL(url, PortPermission::DISALLOW_NON_STANDARD_PORTS))
|
||||
- return false;
|
||||
-
|
||||
- base::StringPiece host(url.host_piece());
|
||||
- std::string_view host(url.host_piece());
|
||||
- StripTrailingDot(&host);
|
||||
-
|
||||
- static constexpr auto google_subdomains =
|
||||
- base::MakeFixedFlatSet<base::StringPiece>(
|
||||
- base::MakeFixedFlatSet<std::string_view>(
|
||||
- {"ipv4.google.com", "ipv6.google.com"});
|
||||
-
|
||||
- return google_subdomains.contains(host);
|
||||
@@ -301,20 +302,20 @@
|
||||
} // namespace
|
||||
|
||||
// Global functions -----------------------------------------------------------
|
||||
@@ -142,12 +38,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
|
||||
@@ -143,12 +38,6 @@ bool IsGoogleSearchSubdomainUrl(const GU
|
||||
const char kGoogleHomepageURL[] = "trk:113:https://www.google.com/";
|
||||
|
||||
bool HasGoogleSearchQueryParam(base::StringPiece str) {
|
||||
bool HasGoogleSearchQueryParam(std::string_view str) {
|
||||
- url::Component query(0, static_cast<int>(str.length())), key, value;
|
||||
- while (url::ExtractQueryKeyValue(str, &query, &key, &value)) {
|
||||
- base::StringPiece key_str = str.substr(key.begin, key.len);
|
||||
- std::string_view key_str = str.substr(key.begin, key.len);
|
||||
- if (key_str == "q" || key_str == "as_q" || key_str == "imgurl")
|
||||
- return true;
|
||||
- }
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -158,162 +48,53 @@ std::string GetGoogleLocale(const std::s
|
||||
@@ -159,162 +48,53 @@ std::string GetGoogleLocale(const std::s
|
||||
|
||||
GURL AppendGoogleLocaleParam(const GURL& url,
|
||||
const std::string& application_locale) {
|
||||
@@ -324,13 +325,13 @@
|
||||
}
|
||||
|
||||
std::string GetGoogleCountryCode(const GURL& google_homepage_url) {
|
||||
- base::StringPiece google_hostname = google_homepage_url.host_piece();
|
||||
- std::string_view google_hostname = google_homepage_url.host_piece();
|
||||
- // TODO(igorcov): This needs a fix for case when the host has a trailing dot,
|
||||
- // like "google.com./". https://crbug.com/720295.
|
||||
- const size_t last_dot = google_hostname.find_last_of('.');
|
||||
- if (last_dot == std::string::npos)
|
||||
- return std::string();
|
||||
- base::StringPiece country_code = google_hostname.substr(last_dot + 1);
|
||||
- std::string_view country_code = google_hostname.substr(last_dot + 1);
|
||||
- // Assume the com TLD implies the US.
|
||||
- if (country_code == "com")
|
||||
- return "us";
|
||||
@@ -391,7 +392,7 @@
|
||||
+ return false;
|
||||
}
|
||||
|
||||
bool IsGoogleHostname(base::StringPiece host,
|
||||
bool IsGoogleHostname(std::string_view host,
|
||||
SubdomainPermission subdomain_permission) {
|
||||
- url::CanonHostInfo host_info;
|
||||
- return IsCanonicalHostGoogleHostname(net::CanonicalizeHost(host, &host_info),
|
||||
@@ -408,7 +409,7 @@
|
||||
- }
|
||||
-
|
||||
- // Make sure the path is a known home page path.
|
||||
- base::StringPiece path(url.path_piece());
|
||||
- std::string_view path(url.path_piece());
|
||||
- return IsPathHomePageBase(path) ||
|
||||
- base::StartsWith(path, "/ig", base::CompareCase::INSENSITIVE_ASCII);
|
||||
+ return false;
|
||||
@@ -423,7 +424,7 @@
|
||||
- }
|
||||
-
|
||||
- // Make sure the path is a known search path.
|
||||
- base::StringPiece path(url.path_piece());
|
||||
- std::string_view path(url.path_piece());
|
||||
- bool is_home_page_base = IsPathHomePageBase(path);
|
||||
- if (!is_home_page_base && path != "/search" && path != "/imgres")
|
||||
- return false;
|
||||
@@ -489,7 +490,7 @@
|
||||
|
||||
--- a/components/page_load_metrics/browser/page_load_metrics_util.cc
|
||||
+++ b/components/page_load_metrics/browser/page_load_metrics_util.cc
|
||||
@@ -283,9 +283,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
|
||||
@@ -284,9 +284,7 @@ bool DidObserveLoadingBehaviorInAnyFrame
|
||||
}
|
||||
|
||||
bool IsGoogleSearchHostname(const GURL& url) {
|
||||
@@ -502,7 +503,7 @@
|
||||
bool IsGoogleSearchResultUrl(const GURL& url) {
|
||||
--- a/components/page_load_metrics/common/page_load_metrics_util.cc
|
||||
+++ b/components/page_load_metrics/common/page_load_metrics_util.cc
|
||||
@@ -24,38 +24,7 @@ const int kExtraBufferTimerDelayMillis =
|
||||
@@ -25,38 +25,7 @@ const int kExtraBufferTimerDelayMillis =
|
||||
} // namespace
|
||||
|
||||
std::optional<std::string> GetGoogleHostnamePrefix(const GURL& url) {
|
||||
@@ -518,14 +519,14 @@
|
||||
- // want to match URLs like www.google.appspot.com.
|
||||
- net::registry_controlled_domains::EXCLUDE_PRIVATE_REGISTRIES);
|
||||
-
|
||||
- const base::StringPiece hostname = url.host_piece();
|
||||
- const std::string_view hostname = url.host_piece();
|
||||
- if (registry_length == 0 || registry_length == std::string::npos ||
|
||||
- registry_length >= hostname.length()) {
|
||||
- return std::nullopt;
|
||||
- }
|
||||
-
|
||||
- // Removes the tld and the preceding dot.
|
||||
- const base::StringPiece hostname_minus_registry =
|
||||
- const std::string_view hostname_minus_registry =
|
||||
- hostname.substr(0, hostname.length() - (registry_length + 1));
|
||||
-
|
||||
- if (hostname_minus_registry == "google")
|
||||
@@ -662,7 +663,7 @@
|
||||
} // namespace variations
|
||||
--- a/net/base/url_util.cc
|
||||
+++ b/net/base/url_util.cc
|
||||
@@ -489,28 +489,6 @@ bool HasGoogleHost(const GURL& url) {
|
||||
@@ -495,28 +495,6 @@ bool HasGoogleHost(const GURL& url) {
|
||||
}
|
||||
|
||||
bool IsGoogleHost(std::string_view host) {
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
"//third_party/widevine/cdm",
|
||||
]
|
||||
if (invoker.collect_inputs_only) {
|
||||
@@ -1218,7 +1217,6 @@ if (is_win) {
|
||||
@@ -1219,7 +1218,6 @@ if (is_win) {
|
||||
":optimization_guide_library",
|
||||
":swiftshader_library",
|
||||
":widevine_cdm_library",
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
}
|
||||
|
||||
// static
|
||||
@@ -757,7 +757,7 @@ void PrivacySandboxSettingsImpl::SetTopi
|
||||
@@ -774,7 +774,7 @@ void PrivacySandboxSettingsImpl::SetTopi
|
||||
}
|
||||
|
||||
bool PrivacySandboxSettingsImpl::IsPrivacySandboxRestricted() const {
|
||||
@@ -29,7 +29,7 @@
|
||||
}
|
||||
|
||||
bool PrivacySandboxSettingsImpl::IsPrivacySandboxCurrentlyUnrestricted() const {
|
||||
@@ -826,11 +826,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
|
||||
@@ -843,11 +843,7 @@ PrivacySandboxSettingsImpl::GetPrivacySa
|
||||
return Status::kIncognitoProfile;
|
||||
}
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc
|
||||
+++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc
|
||||
@@ -176,31 +176,13 @@ void WebRtcLogUploader::OnLoggingStopped
|
||||
@@ -179,31 +179,13 @@ void WebRtcLogUploader::OnLoggingStopped
|
||||
DCHECK(meta_data.get());
|
||||
DCHECK(!upload_done_data.paths.directory.empty());
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
} else {
|
||||
main_task_runner_->PostTask(
|
||||
FROM_HERE,
|
||||
@@ -217,28 +199,7 @@ void WebRtcLogUploader::PrepareMultipart
|
||||
@@ -220,28 +202,7 @@ void WebRtcLogUploader::PrepareMultipart
|
||||
DCHECK(!compressed_log.empty());
|
||||
DCHECK(meta_data.get());
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
}
|
||||
|
||||
void WebRtcLogUploader::UploadStoredLog(
|
||||
@@ -305,48 +266,6 @@ void WebRtcLogUploader::LoggingStoppedDo
|
||||
@@ -308,48 +269,6 @@ void WebRtcLogUploader::LoggingStoppedDo
|
||||
DCHECK(log_buffer.get());
|
||||
DCHECK(!log_paths.directory.empty());
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
|
||||
+++ b/chrome/browser/extensions/chrome_content_browser_client_extensions_part.cc
|
||||
@@ -720,12 +720,6 @@ std::vector<url::Origin> ChromeContentBr
|
||||
@@ -624,12 +624,6 @@ std::vector<url::Origin> ChromeContentBr
|
||||
GetOriginsRequiringDedicatedProcess() {
|
||||
std::vector<url::Origin> list;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/common/chrome_features.cc
|
||||
+++ b/chrome/common/chrome_features.cc
|
||||
@@ -361,12 +361,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
|
||||
@@ -345,12 +345,7 @@ BASE_FEATURE(kDisruptiveNotificationPerm
|
||||
// Enable DNS over HTTPS (DoH).
|
||||
BASE_FEATURE(kDnsOverHttps,
|
||||
"DnsOverHttps",
|
||||
|
||||
93
patches/core/ungoogled-chromium/extensions-manifestv2.patch
Normal file
93
patches/core/ungoogled-chromium/extensions-manifestv2.patch
Normal file
@@ -0,0 +1,93 @@
|
||||
--- a/chrome/browser/extensions/chrome_browser_context_keyed_service_factories.cc
|
||||
+++ b/chrome/browser/extensions/chrome_browser_context_keyed_service_factories.cc
|
||||
@@ -22,7 +22,6 @@
|
||||
#include "chrome/browser/extensions/extension_web_ui_override_registrar.h"
|
||||
#include "chrome/browser/extensions/install_tracker_factory.h"
|
||||
#include "chrome/browser/extensions/install_verifier_factory.h"
|
||||
-#include "chrome/browser/extensions/manifest_v2_experiment_manager.h"
|
||||
#include "chrome/browser/extensions/menu_manager_factory.h"
|
||||
#include "chrome/browser/extensions/permissions/permissions_updater.h"
|
||||
#include "chrome/browser/extensions/plugin_manager.h"
|
||||
@@ -48,7 +47,6 @@ void EnsureChromeBrowserContextKeyedServ
|
||||
extensions::IncognitoConnectability::EnsureFactoryBuilt();
|
||||
extensions::InstallTrackerFactory::GetInstance();
|
||||
extensions::InstallVerifierFactory::GetInstance();
|
||||
- extensions::ManifestV2ExperimentManager::GetFactory();
|
||||
extensions::MenuManagerFactory::GetInstance();
|
||||
extensions::PermissionsUpdater::EnsureAssociatedFactoryBuilt();
|
||||
#if BUILDFLAG(ENABLE_PLUGINS)
|
||||
--- a/chrome/browser/extensions/extension_management.cc
|
||||
+++ b/chrome/browser/extensions/extension_management.cc
|
||||
@@ -287,31 +287,7 @@ bool ExtensionManagement::IsAllowedManif
|
||||
int manifest_version,
|
||||
const std::string& extension_id,
|
||||
Manifest::Type manifest_type) {
|
||||
- bool enabled_by_default =
|
||||
- !base::FeatureList::IsEnabled(
|
||||
- extensions_features::kExtensionsManifestV3Only) ||
|
||||
- manifest_version >= 3;
|
||||
-
|
||||
- // Manifest version policy only supports normal extensions and Chrome OS login
|
||||
- // screen extension.
|
||||
- if (manifest_type != Manifest::Type::TYPE_EXTENSION &&
|
||||
- manifest_type != Manifest::Type::TYPE_LOGIN_SCREEN_EXTENSION) {
|
||||
- return enabled_by_default;
|
||||
- }
|
||||
- switch (global_settings_->manifest_v2_setting) {
|
||||
- case internal::GlobalSettings::ManifestV2Setting::kDefault:
|
||||
- return enabled_by_default;
|
||||
- case internal::GlobalSettings::ManifestV2Setting::kDisabled:
|
||||
- return manifest_version >= 3;
|
||||
- case internal::GlobalSettings::ManifestV2Setting::kEnabled:
|
||||
return true;
|
||||
- case internal::GlobalSettings::ManifestV2Setting::kEnabledForForceInstalled:
|
||||
- auto installation_mode =
|
||||
- GetInstallationMode(extension_id, /*update_url=*/std::string());
|
||||
- return manifest_version >= 3 ||
|
||||
- installation_mode == INSTALLATION_FORCED ||
|
||||
- installation_mode == INSTALLATION_RECOMMENDED;
|
||||
- }
|
||||
}
|
||||
|
||||
bool ExtensionManagement::IsAllowedManifestVersion(const Extension* extension) {
|
||||
@@ -332,26 +308,8 @@ bool ExtensionManagement::IsExemptFromMV
|
||||
return false;
|
||||
}
|
||||
|
||||
- switch (global_settings_->manifest_v2_setting) {
|
||||
- case internal::GlobalSettings::ManifestV2Setting::kDefault:
|
||||
- // Default browser behavior. Not exempt.
|
||||
- return false;
|
||||
- case internal::GlobalSettings::ManifestV2Setting::kDisabled:
|
||||
- // All MV2 extensions are disallowed. Not exempt.
|
||||
- return false;
|
||||
- case internal::GlobalSettings::ManifestV2Setting::kEnabled:
|
||||
// All MV2 extensions are allowed. Exempt.
|
||||
return true;
|
||||
- case internal::GlobalSettings::ManifestV2Setting::kEnabledForForceInstalled:
|
||||
- // Force-installed MV2 extensions are allowed. Exempt if it's a force-
|
||||
- // installed extension only.
|
||||
- auto installation_mode =
|
||||
- GetInstallationMode(extension_id, /*update_url=*/std::string());
|
||||
- return installation_mode == INSTALLATION_FORCED ||
|
||||
- installation_mode == INSTALLATION_RECOMMENDED;
|
||||
- }
|
||||
-
|
||||
- return false;
|
||||
}
|
||||
|
||||
bool ExtensionManagement::IsAllowedByUnpublishedAvailabilityPolicy(
|
||||
--- a/chrome/browser/extensions/manifest_v2_experiment_manager.cc
|
||||
+++ b/chrome/browser/extensions/manifest_v2_experiment_manager.cc
|
||||
@@ -76,11 +76,6 @@ KeyedService* ManifestV2ExperimentManage
|
||||
}
|
||||
|
||||
MV2ExperimentStage CalculateCurrentExperimentStage() {
|
||||
- if (base::FeatureList::IsEnabled(
|
||||
- extensions_features::kExtensionManifestV2DeprecationWarning)) {
|
||||
- return MV2ExperimentStage::kWarning;
|
||||
- }
|
||||
-
|
||||
return MV2ExperimentStage::kNone;
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
# from disk image and Keystone promotion (if so enabled). It
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -853,10 +853,6 @@ static_library("browser") {
|
||||
@@ -850,10 +850,6 @@ static_library("browser") {
|
||||
"navigation_predictor/navigation_predictor_metrics_document_data.h",
|
||||
"navigation_predictor/navigation_predictor_preconnect_client.cc",
|
||||
"navigation_predictor/navigation_predictor_preconnect_client.h",
|
||||
@@ -25,7 +25,7 @@
|
||||
"navigation_predictor/search_engine_preconnector.cc",
|
||||
"navigation_predictor/search_engine_preconnector.h",
|
||||
"net/chrome_mojo_proxy_resolver_factory.cc",
|
||||
@@ -969,10 +965,6 @@ static_library("browser") {
|
||||
@@ -972,10 +968,6 @@ static_library("browser") {
|
||||
"optimization_guide/chrome_prediction_model_store.h",
|
||||
"optimization_guide/model_execution/chrome_on_device_model_service_controller.cc",
|
||||
"optimization_guide/model_execution/chrome_on_device_model_service_controller.h",
|
||||
@@ -44,10 +44,10 @@
|
||||
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
|
||||
-#include "chrome/browser/navigation_predictor/preloading_model_keyed_service.h"
|
||||
-#include "chrome/browser/navigation_predictor/preloading_model_keyed_service_factory.h"
|
||||
#include "chrome/browser/preloading/prefetch/no_state_prefetch/no_state_prefetch_manager_factory.h"
|
||||
#include "chrome/browser/preloading/preloading_prefs.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
@@ -95,11 +93,6 @@ base::TimeDelta MLModelExecutionTimerSta
|
||||
#include "components/no_state_prefetch/browser/no_state_prefetch_manager.h"
|
||||
@@ -94,11 +92,6 @@ base::TimeDelta MLModelExecutionTimerSta
|
||||
return base::Milliseconds(timer_start_delay);
|
||||
}
|
||||
|
||||
@@ -57,9 +57,9 @@
|
||||
- return base::Milliseconds(timer_interval);
|
||||
-}
|
||||
|
||||
bool MaySendTraffic() {
|
||||
// TODO(b/290223353): Due to concerns about the amount of traffic this feature
|
||||
@@ -364,71 +357,6 @@ void NavigationPredictor::ProcessPointer
|
||||
bool MLModelOneExecutionPerHover() {
|
||||
static bool one_execution_per_hover =
|
||||
@@ -369,80 +362,6 @@ void NavigationPredictor::ProcessPointer
|
||||
}
|
||||
|
||||
void NavigationPredictor::OnMLModelExecutionTimerFired() {
|
||||
@@ -122,7 +122,16 @@
|
||||
- base::BindOnce(&NavigationPredictor::OnPreloadingHeuristicsModelDone,
|
||||
- weak_ptr_factory_.GetWeakPtr(), anchor.target_url));
|
||||
-
|
||||
- if (!ml_model_execution_timer_.IsRunning()) {
|
||||
- // TODO(crbug.com/40278151): In its current form, the model does not seem to
|
||||
- // ever increase in confidence when dwelling on an anchor, which makes
|
||||
- // repeated executions wasteful. So we only do one execution per mouse over.
|
||||
- // As we iterate on the model, multiple executions may become useful, but we
|
||||
- // need to take care to not produce a large amount of redundant predictions
|
||||
- // (as seen in crbug.com/338200075 ). Other ideas here could be to only report
|
||||
- // when the score differs from the previous execution and/or to have a fixed
|
||||
- // limit on the number of executions while dwelling.
|
||||
- if (!MLModelOneExecutionPerHover() &&
|
||||
- !ml_model_execution_timer_.IsRunning()) {
|
||||
- ml_model_execution_timer_.Start(
|
||||
- FROM_HERE, MLModelExecutionTimerInterval(),
|
||||
- base::BindOnce(&NavigationPredictor::OnMLModelExecutionTimerFired,
|
||||
@@ -133,7 +142,7 @@
|
||||
void NavigationPredictor::SetModelScoreCallbackForTesting(
|
||||
--- a/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
+++ b/chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
|
||||
@@ -93,7 +93,6 @@
|
||||
@@ -92,7 +92,6 @@
|
||||
#include "chrome/browser/media_galleries/media_galleries_preferences_factory.h"
|
||||
#include "chrome/browser/metrics/variations/google_groups_updater_service_factory.h"
|
||||
#include "chrome/browser/navigation_predictor/navigation_predictor_keyed_service_factory.h"
|
||||
@@ -141,7 +150,7 @@
|
||||
#include "chrome/browser/net/dns_probe_service_factory.h"
|
||||
#include "chrome/browser/net/profile_network_context_service_factory.h"
|
||||
#include "chrome/browser/notifications/metrics/notification_metrics_logger_factory.h"
|
||||
@@ -931,7 +930,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
@@ -939,7 +938,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
#endif
|
||||
ModelTypeStoreServiceFactory::GetInstance();
|
||||
NavigationPredictorKeyedServiceFactory::GetInstance();
|
||||
@@ -149,8 +158,8 @@
|
||||
#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
NearbySharingServiceFactory::GetInstance();
|
||||
if (base::FeatureList::IsEnabled(ash::features::kNearbyPresence)) {
|
||||
@@ -978,9 +976,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
}
|
||||
@@ -984,9 +982,6 @@ void ChromeBrowserMainExtraPartsProfiles
|
||||
OneTimePermissionsTrackerFactory::GetInstance();
|
||||
#endif
|
||||
OpenerHeuristicServiceFactory::GetInstance();
|
||||
- if (optimization_guide::ShouldStartModelValidator()) {
|
||||
@@ -169,7 +178,7 @@
|
||||
#include "chrome/browser/permissions/adaptive_quiet_notification_permission_ui_enabler.h"
|
||||
#include "chrome/browser/prefs/incognito_mode_prefs.h"
|
||||
#include "chrome/browser/profiles/delete_profile_helper.h"
|
||||
@@ -1543,9 +1542,6 @@ void ProfileManager::DoFinalInitForServi
|
||||
@@ -1542,9 +1541,6 @@ void ProfileManager::DoFinalInitForServi
|
||||
// Ensure NavigationPredictorKeyedService is started.
|
||||
NavigationPredictorKeyedServiceFactory::GetForProfile(profile);
|
||||
|
||||
@@ -311,8 +320,8 @@
|
||||
} // namespace settings
|
||||
--- a/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
|
||||
+++ b/chrome/browser/ui/webui/side_panel/read_anything/read_anything_untrusted_page_handler.cc
|
||||
@@ -15,8 +15,6 @@
|
||||
#include "base/values.h"
|
||||
@@ -17,8 +17,6 @@
|
||||
#include "chrome/browser/accessibility/pdf_ocr_controller_factory.h"
|
||||
#include "chrome/browser/browser_features.h"
|
||||
#include "chrome/browser/profiles/profile.h"
|
||||
-#include "chrome/browser/screen_ai/screen_ai_service_router.h"
|
||||
@@ -320,7 +329,7 @@
|
||||
#include "chrome/browser/translate/chrome_translate_client.h"
|
||||
#include "chrome/browser/ui/browser.h"
|
||||
#include "chrome/browser/ui/browser_finder.h"
|
||||
@@ -214,15 +212,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
|
||||
@@ -298,21 +296,6 @@ ReadAnythingUntrustedPageHandler::ReadAn
|
||||
highlightGranularity);
|
||||
}
|
||||
|
||||
@@ -332,10 +341,65 @@
|
||||
- base::BindOnce(
|
||||
- &ReadAnythingUntrustedPageHandler::OnScreenAIServiceInitialized,
|
||||
- weak_factory_.GetWeakPtr()));
|
||||
- }
|
||||
- if (features::IsPdfOcrEnabled()) {
|
||||
- screen_ai::ScreenAIServiceRouterFactory::GetForBrowserContext(
|
||||
- browser_->profile())
|
||||
- ->GetServiceStateAsync(screen_ai::ScreenAIServiceRouter::Service::kOCR,
|
||||
- base::DoNothing());
|
||||
- }
|
||||
|
||||
OnActiveWebContentsChanged();
|
||||
|
||||
@@ -716,10 +699,6 @@ void ReadAnythingUntrustedPageHandler::S
|
||||
inner_contents[0]->GetPrimaryMainFrame()->GetLastCommittedOrigin())) {
|
||||
pdf_observer_ = std::make_unique<ReadAnythingWebContentsObserver>(
|
||||
weak_factory_.GetSafeRef(), inner_contents[0], kReadAnythingAXMode);
|
||||
- if (features::IsPdfOcrEnabled()) {
|
||||
- screen_ai::PdfOcrControllerFactory::GetForProfile(browser_->profile())
|
||||
- ->Activate();
|
||||
- }
|
||||
}
|
||||
}
|
||||
|
||||
--- a/chrome/renderer/BUILD.gn
|
||||
+++ b/chrome/renderer/BUILD.gn
|
||||
@@ -423,10 +423,6 @@ static_library("renderer") {
|
||||
sources += [
|
||||
"accessibility/ax_tree_distiller.cc",
|
||||
"accessibility/ax_tree_distiller.h",
|
||||
- "accessibility/read_anything_app_controller.cc",
|
||||
- "accessibility/read_anything_app_controller.h",
|
||||
- "accessibility/read_anything_app_model.cc",
|
||||
- "accessibility/read_anything_app_model.h",
|
||||
"media/chrome_speech_recognition_client.cc",
|
||||
"media/chrome_speech_recognition_client.h",
|
||||
"searchbox/searchbox.cc",
|
||||
--- a/chrome/renderer/chrome_render_frame_observer.cc
|
||||
+++ b/chrome/renderer/chrome_render_frame_observer.cc
|
||||
@@ -320,22 +320,6 @@ void ChromeRenderFrameObserver::DidCommi
|
||||
}
|
||||
|
||||
void ChromeRenderFrameObserver::DidClearWindowObject() {
|
||||
-#if !BUILDFLAG(IS_ANDROID)
|
||||
- const base::CommandLine& command_line =
|
||||
- *base::CommandLine::ForCurrentProcess();
|
||||
- if (command_line.HasSwitch(switches::kInstantProcess))
|
||||
- SearchBoxExtension::Install(render_frame()->GetWebFrame());
|
||||
-
|
||||
- // Install ReadAnythingAppController on render frames with the Read Anything
|
||||
- // url, which is chrome-untrusted. ReadAnythingAppController installs v8
|
||||
- // bindings in the chrome.readingMode namespace which are consumed by
|
||||
- // read_anything/app.ts, the resource of the Read Anything WebUI.
|
||||
- if (features::IsReadAnythingEnabled() &&
|
||||
- render_frame()->GetWebFrame()->GetDocument().Url() ==
|
||||
- chrome::kChromeUIUntrustedReadAnythingSidePanelURL) {
|
||||
- ReadAnythingAppController::Install(render_frame());
|
||||
- }
|
||||
-#endif // !BUILDFLAG(IS_ANDROID)
|
||||
}
|
||||
|
||||
void ChromeRenderFrameObserver::DidMeaningfulLayout(
|
||||
--- a/chrome/test/chromedriver/BUILD.gn
|
||||
+++ b/chrome/test/chromedriver/BUILD.gn
|
||||
@@ -405,7 +405,7 @@ source_set("lib") {
|
||||
@@ -359,7 +423,7 @@
|
||||
python_library("fixtures") {
|
||||
--- a/components/omnibox/browser/autocomplete_classifier.cc
|
||||
+++ b/components/omnibox/browser/autocomplete_classifier.cc
|
||||
@@ -99,8 +99,6 @@ void AutocompleteClassifier::Classify(
|
||||
@@ -103,8 +103,6 @@ void AutocompleteClassifier::Classify(
|
||||
metrics::OmniboxEventProto::PageClassification page_classification,
|
||||
AutocompleteMatch* match,
|
||||
GURL* alternate_nav_url) {
|
||||
@@ -381,7 +445,7 @@
|
||||
fuzzer_test("update_client_protocol_serializer_fuzzer") {
|
||||
--- a/content/shell/BUILD.gn
|
||||
+++ b/content/shell/BUILD.gn
|
||||
@@ -766,10 +766,6 @@ if (is_apple) {
|
||||
@@ -802,10 +802,6 @@ if (is_apple) {
|
||||
deps = [ "//third_party/icu:icudata" ]
|
||||
}
|
||||
|
||||
@@ -392,6 +456,26 @@
|
||||
if (v8_use_external_startup_data) {
|
||||
public_deps += [ "//v8" ]
|
||||
if (use_v8_context_snapshot) {
|
||||
--- a/services/passage_embeddings/passage_embeddings_service.cc
|
||||
+++ b/services/passage_embeddings/passage_embeddings_service.cc
|
||||
@@ -6,7 +6,6 @@
|
||||
|
||||
#include "base/files/file.h"
|
||||
#include "components/optimization_guide/machine_learning_tflite_buildflags.h"
|
||||
-#include "services/passage_embeddings/passage_embedder.h"
|
||||
|
||||
namespace passage_embeddings {
|
||||
|
||||
--- a/services/passage_embeddings/passage_embeddings_service.h
|
||||
+++ b/services/passage_embeddings/passage_embeddings_service.h
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
namespace passage_embeddings {
|
||||
|
||||
-class PassageEmbedder;
|
||||
|
||||
// Class implementation of the passage embeddings service mojo interface.
|
||||
class PassageEmbeddingsService : public mojom::PassageEmbeddingsService {
|
||||
--- a/services/screen_ai/buildflags/features.gni
|
||||
+++ b/services/screen_ai/buildflags/features.gni
|
||||
@@ -7,14 +7,13 @@ import("//build/config/sanitizers/saniti
|
||||
@@ -401,8 +485,8 @@
|
||||
- enable_screen_ai_service = is_linux || is_mac || is_chromeos || is_win
|
||||
+ enable_screen_ai_service = false
|
||||
|
||||
# Screen AI library is not yet available for browser tests on ChromeOS.
|
||||
# TODO(b/40267312): Expand this browser test for all supported targets.
|
||||
# Screen AI library is not available for browser tests on ChromeOS. Tast tests
|
||||
# cover library's OCR functionality on ChromeOS.
|
||||
enable_screen_ai_browsertests =
|
||||
- is_linux || (is_mac && (target_cpu == "arm64" || target_cpu == "x64")) ||
|
||||
- (is_win && (target_cpu == "x64" || target_cpu == "x86"))
|
||||
@@ -424,7 +508,7 @@
|
||||
group("devtools_all_files") {
|
||||
--- a/third_party/devtools-frontend/src/front_end/BUILD.gn
|
||||
+++ b/third_party/devtools-frontend/src/front_end/BUILD.gn
|
||||
@@ -185,7 +185,6 @@ group("unittests") {
|
||||
@@ -184,7 +184,6 @@ group("unittests") {
|
||||
"panels/sources/components:unittests",
|
||||
"panels/timeline:unittests",
|
||||
"panels/timeline/components:unittests",
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -9,7 +9,7 @@
|
||||
#include "components/translate/core/browser/translate_download_manager.h"
|
||||
#include "components/translate/core/browser/translate_manager.h"
|
||||
#include "components/translate/core/browser/translate_prefs.h"
|
||||
@@ -2206,6 +2207,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
@@ -2223,6 +2224,7 @@ void RenderViewContextMenu::AppendPageIt
|
||||
menu_model_.AddSeparator(ui::NORMAL_SEPARATOR);
|
||||
|
||||
if (CanTranslate(/*menu_logging=*/true)) {
|
||||
@@ -19,15 +19,15 @@
|
||||
}
|
||||
--- a/components/translate/core/browser/translate_language_list.cc
|
||||
+++ b/components/translate/core/browser/translate_language_list.cc
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <optional>
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <string_view>
|
||||
|
||||
#include "base/check.h"
|
||||
+#include "base/command_line.h"
|
||||
#include "base/debug/dump_without_crashing.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/json/json_reader.h"
|
||||
@@ -25,6 +26,7 @@
|
||||
@@ -26,6 +27,7 @@
|
||||
#include "components/translate/core/browser/translate_event_details.h"
|
||||
#include "components/translate/core/browser/translate_url_fetcher.h"
|
||||
#include "components/translate/core/browser/translate_url_util.h"
|
||||
@@ -35,7 +35,7 @@
|
||||
#include "components/translate/core/common/translate_util.h"
|
||||
#include "net/base/url_util.h"
|
||||
#include "ui/base/l10n/l10n_util.h"
|
||||
@@ -392,6 +394,9 @@ GURL TranslateLanguageList::TranslateLan
|
||||
@@ -393,6 +395,9 @@ GURL TranslateLanguageList::TranslateLan
|
||||
}
|
||||
|
||||
void TranslateLanguageList::RequestLanguageList() {
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2615,6 +2615,7 @@ static_library("browser") {
|
||||
@@ -2626,6 +2626,7 @@ static_library("browser") {
|
||||
"//third_party/libyuv",
|
||||
"//third_party/metrics_proto",
|
||||
"//third_party/re2",
|
||||
@@ -19,7 +19,7 @@
|
||||
"//third_party/widevine/cdm:headers",
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -170,6 +170,7 @@
|
||||
@@ -172,6 +172,7 @@
|
||||
#include "components/translate/core/common/translate_util.h"
|
||||
#include "components/trusted_vault/features.h"
|
||||
#include "components/ui_devtools/switches.h"
|
||||
@@ -44,7 +44,7 @@
|
||||
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -252,6 +252,7 @@ source_set("browser") {
|
||||
@@ -253,6 +253,7 @@ source_set("browser") {
|
||||
"//third_party/libyuv",
|
||||
"//third_party/re2",
|
||||
"//third_party/sqlite",
|
||||
@@ -62,7 +62,7 @@
|
||||
#include "components/viz/common/switches.h"
|
||||
#include "components/viz/host/gpu_client.h"
|
||||
#include "content/browser/bad_message.h"
|
||||
@@ -3449,6 +3450,8 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3465,6 +3466,8 @@ void RenderProcessHostImpl::PropagateBro
|
||||
switches::kEnableWebGLImageChromium,
|
||||
switches::kEnableWebGPUDeveloperFeatures,
|
||||
switches::kFileUrlPathAlias,
|
||||
@@ -91,7 +91,7 @@
|
||||
#include "ui/accessibility/accessibility_features.h"
|
||||
#include "ui/base/ui_base_features.h"
|
||||
#include "ui/events/blink/blink_features.h"
|
||||
@@ -498,6 +499,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -488,6 +489,10 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
switches::kEnableWebGPUDeveloperFeatures, true},
|
||||
{wrf::EnableWebGPUExperimentalFeatures, switches::kEnableUnsafeWebGPU,
|
||||
true},
|
||||
@@ -124,7 +124,7 @@
|
||||
#include "base/ranges/algorithm.h"
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
#include "base/time/time.h"
|
||||
@@ -932,6 +933,11 @@ Document::Document(const DocumentInit& i
|
||||
@@ -906,6 +907,11 @@ Document::Document(const DocumentInit& i
|
||||
TRACE_EVENT_WITH_FLOW0("blink", "Document::Document", TRACE_ID_LOCAL(this),
|
||||
TRACE_EVENT_FLAG_FLOW_OUT);
|
||||
DCHECK(agent_);
|
||||
@@ -136,7 +136,7 @@
|
||||
if (base::FeatureList::IsEnabled(features::kDelayAsyncScriptExecution) &&
|
||||
features::kDelayAsyncScriptExecutionDelayByDefaultParam.Get()) {
|
||||
script_runner_delayer_->Activate();
|
||||
@@ -1047,6 +1053,14 @@ const Position Document::PositionAdjuste
|
||||
@@ -1021,6 +1027,14 @@ const Position Document::PositionAdjuste
|
||||
return Position::BeforeNode(*shadow_host);
|
||||
}
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
selector_query_cache_ = std::make_unique<SelectorQueryCache>();
|
||||
--- a/third_party/blink/renderer/core/dom/document.h
|
||||
+++ b/third_party/blink/renderer/core/dom/document.h
|
||||
@@ -539,6 +539,10 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -548,6 +548,10 @@ class CORE_EXPORT Document : public Cont
|
||||
has_xml_declaration_ = has_xml_declaration ? 1 : 0;
|
||||
}
|
||||
|
||||
@@ -164,7 +164,7 @@
|
||||
AtomicString visibilityState() const;
|
||||
bool IsPageVisible() const;
|
||||
bool hidden() const;
|
||||
@@ -2566,6 +2570,9 @@ class CORE_EXPORT Document : public Cont
|
||||
@@ -2545,6 +2549,9 @@ class CORE_EXPORT Document : public Cont
|
||||
|
||||
base::ElapsedTimer start_time_;
|
||||
|
||||
@@ -176,7 +176,7 @@
|
||||
|
||||
--- a/third_party/blink/renderer/core/dom/element.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/element.cc
|
||||
@@ -2413,6 +2413,11 @@ DOMRectList* Element::getClientRects() {
|
||||
@@ -2432,6 +2432,11 @@ DOMRectList* Element::getClientRects() {
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustQuadsForScrollAndAbsoluteZoom(quads,
|
||||
*element_layout_object);
|
||||
@@ -188,7 +188,7 @@
|
||||
return MakeGarbageCollected<DOMRectList>(quads);
|
||||
}
|
||||
|
||||
@@ -2440,6 +2445,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
@@ -2459,6 +2464,9 @@ gfx::RectF Element::GetBoundingClientRec
|
||||
DCHECK(element_layout_object);
|
||||
GetDocument().AdjustRectForScrollAndAbsoluteZoom(result,
|
||||
*element_layout_object);
|
||||
@@ -200,7 +200,7 @@
|
||||
|
||||
--- a/third_party/blink/renderer/core/dom/range.cc
|
||||
+++ b/third_party/blink/renderer/core/dom/range.cc
|
||||
@@ -1624,6 +1624,12 @@ DOMRectList* Range::getClientRects() con
|
||||
@@ -1607,6 +1607,12 @@ DOMRectList* Range::getClientRects() con
|
||||
Vector<gfx::QuadF> quads;
|
||||
GetBorderAndTextQuads(quads);
|
||||
|
||||
@@ -213,7 +213,7 @@
|
||||
return MakeGarbageCollected<DOMRectList>(quads);
|
||||
}
|
||||
|
||||
@@ -1631,7 +1637,11 @@ DOMRect* Range::getBoundingClientRect()
|
||||
@@ -1614,7 +1620,11 @@ DOMRect* Range::getBoundingClientRect()
|
||||
// TODO(crbug.com/1499981): This should be removed once synchronized scrolling
|
||||
// impact is understood.
|
||||
SyncScrollAttemptHeuristic::DidAccessScrollOffset();
|
||||
@@ -266,7 +266,7 @@
|
||||
const TextDirection&,
|
||||
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
@@ -83,6 +83,9 @@
|
||||
@@ -90,6 +90,9 @@
|
||||
#include "ui/gfx/geometry/quad_f.h"
|
||||
#include "ui/gfx/geometry/skia_conversions.h"
|
||||
|
||||
@@ -276,7 +276,7 @@
|
||||
namespace blink {
|
||||
|
||||
BASE_FEATURE(kDisableCanvasOverdrawOptimization,
|
||||
@@ -3205,8 +3208,22 @@ TextMetrics* BaseRenderingContext2D::mea
|
||||
@@ -3279,8 +3282,22 @@ TextMetrics* BaseRenderingContext2D::mea
|
||||
const CanvasRenderingContext2DState& state = GetState();
|
||||
TextDirection direction = ToTextDirection(state.GetDirection(), canvas);
|
||||
|
||||
@@ -328,7 +328,7 @@
|
||||
} // namespace blink
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -1746,6 +1746,12 @@
|
||||
@@ -1724,6 +1724,12 @@
|
||||
status: "experimental",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -34,7 +34,7 @@ approach to change color components.
|
||||
#endif // CHROME_BROWSER_BROMITE_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/renderer_host/render_process_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_process_host_impl.cc
|
||||
@@ -3452,6 +3452,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
@@ -3468,6 +3468,7 @@ void RenderProcessHostImpl::PropagateBro
|
||||
switches::kFileUrlPathAlias,
|
||||
switches::kFingerprintingClientRectsNoise,
|
||||
switches::kFingerprintingCanvasMeasureTextNoise,
|
||||
@@ -44,7 +44,7 @@ approach to change color components.
|
||||
switches::kForceGpuMemAvailableMb,
|
||||
--- a/content/child/runtime_features.cc
|
||||
+++ b/content/child/runtime_features.cc
|
||||
@@ -503,6 +503,8 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
@@ -493,6 +493,8 @@ void SetRuntimeFeaturesFromCommandLine(c
|
||||
switches::kFingerprintingClientRectsNoise, true},
|
||||
{wrf::EnableFingerprintingCanvasMeasureTextNoise,
|
||||
switches::kFingerprintingCanvasMeasureTextNoise, true},
|
||||
@@ -65,7 +65,7 @@ approach to change color components.
|
||||
};
|
||||
--- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc
|
||||
@@ -2530,6 +2530,9 @@ ImageData* BaseRenderingContext2D::getIm
|
||||
@@ -2604,6 +2604,9 @@ ImageData* BaseRenderingContext2D::getIm
|
||||
snapshot->PaintImageForCurrentFrame().GetSkImageInfo().bounds();
|
||||
DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh)));
|
||||
}
|
||||
@@ -77,7 +77,7 @@ approach to change color components.
|
||||
return image_data;
|
||||
--- a/third_party/blink/renderer/platform/BUILD.gn
|
||||
+++ b/third_party/blink/renderer/platform/BUILD.gn
|
||||
@@ -1686,7 +1686,9 @@ component("platform") {
|
||||
@@ -1685,7 +1685,9 @@ component("platform") {
|
||||
"//third_party/blink/renderer:non_test_config",
|
||||
]
|
||||
|
||||
@@ -314,7 +314,7 @@ approach to change color components.
|
||||
// Methods overridden by all sub-classes
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -1752,6 +1752,9 @@
|
||||
@@ -1730,6 +1730,9 @@
|
||||
name: "FingerprintingCanvasMeasureTextNoise",
|
||||
},
|
||||
{
|
||||
|
||||
@@ -17,7 +17,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2323,6 +2323,7 @@ static_library("browser") {
|
||||
@@ -2331,6 +2331,7 @@ static_library("browser") {
|
||||
"//components/net_log",
|
||||
"//components/network_hints/common:mojo_bindings",
|
||||
"//components/network_session_configurator/browser",
|
||||
@@ -64,7 +64,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
#include "base/synchronization/waitable_event.h"
|
||||
#include "base/task/sequenced_task_runner.h"
|
||||
#include "base/task/single_thread_task_runner.h"
|
||||
@@ -107,6 +109,7 @@
|
||||
@@ -109,6 +111,7 @@
|
||||
#include "components/metrics/metrics_service.h"
|
||||
#include "components/metrics_services_manager/metrics_services_manager.h"
|
||||
#include "components/metrics_services_manager/metrics_services_manager_client.h"
|
||||
@@ -72,7 +72,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
#include "components/network_time/network_time_tracker.h"
|
||||
#include "components/os_crypt/async/browser/os_crypt_async.h"
|
||||
#include "components/permissions/permissions_client.h"
|
||||
@@ -140,6 +143,7 @@
|
||||
@@ -142,6 +145,7 @@
|
||||
#include "media/media_buildflags.h"
|
||||
#include "mojo/public/cpp/bindings/pending_receiver.h"
|
||||
#include "net/log/net_log.h"
|
||||
@@ -80,7 +80,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
#include "ppapi/buildflags/buildflags.h"
|
||||
#include "printing/buildflags/buildflags.h"
|
||||
#include "services/network/public/cpp/features.h"
|
||||
@@ -383,6 +387,18 @@ void BrowserProcessImpl::Init() {
|
||||
@@ -386,6 +390,18 @@ void BrowserProcessImpl::Init() {
|
||||
pref_change_registrar_.Add(metrics::prefs::kMetricsReportingEnabled,
|
||||
base::BindRepeating(&ApplyMetricsReportingPolicy));
|
||||
|
||||
@@ -101,7 +101,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
|
||||
--- a/chrome/browser/flag_descriptions.cc
|
||||
+++ b/chrome/browser/flag_descriptions.cc
|
||||
@@ -2244,6 +2244,10 @@ const char kLogJsConsoleMessagesDescript
|
||||
@@ -2285,6 +2285,10 @@ const char kLogJsConsoleMessagesDescript
|
||||
"Enable logging JS console messages in system logs, please note that they "
|
||||
"may contain PII.";
|
||||
|
||||
@@ -114,7 +114,7 @@ with limited CPU/memory resources and it is disabled by default.
|
||||
const char kMediaRouterCastAllowAllIPsDescription[] =
|
||||
--- a/chrome/browser/flag_descriptions.h
|
||||
+++ b/chrome/browser/flag_descriptions.h
|
||||
@@ -1297,6 +1297,9 @@ extern const char kLocationBarModelOptim
|
||||
@@ -1311,6 +1311,9 @@ extern const char kLocationBarModelOptim
|
||||
extern const char kLogJsConsoleMessagesName[];
|
||||
extern const char kLogJsConsoleMessagesDescription[];
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@ author: Michael Gilbert <mgilbert@debian.org>
|
||||
|
||||
--- a/chrome/browser/ui/startup/infobar_utils.cc
|
||||
+++ b/chrome/browser/ui/startup/infobar_utils.cc
|
||||
@@ -151,10 +151,6 @@ void AddInfoBarsIfNecessary(Browser* bro
|
||||
@@ -154,10 +154,6 @@ void AddInfoBarsIfNecessary(Browser* bro
|
||||
infobars::ContentInfoBarManager* infobar_manager =
|
||||
infobars::ContentInfoBarManager::FromWebContents(web_contents);
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
void BackgroundModeManager::RegisterProfile(Profile* profile) {
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -1520,7 +1520,7 @@ void ChromeContentBrowserClient::Registe
|
||||
@@ -1525,7 +1525,7 @@ void ChromeContentBrowserClient::Registe
|
||||
void ChromeContentBrowserClient::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(prefs::kDisable3DAPIs, false);
|
||||
@@ -23,7 +23,7 @@
|
||||
// used for mapping the command-line flags).
|
||||
--- a/chrome/browser/net/profile_network_context_service.cc
|
||||
+++ b/chrome/browser/net/profile_network_context_service.cc
|
||||
@@ -428,7 +428,7 @@ void ProfileNetworkContextService::Updat
|
||||
@@ -385,7 +385,7 @@ void ProfileNetworkContextService::Confi
|
||||
void ProfileNetworkContextService::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(embedder_support::kAlternateErrorPagesEnabled,
|
||||
@@ -120,7 +120,7 @@
|
||||
|
||||
--- a/components/password_manager/core/browser/password_manager.cc
|
||||
+++ b/components/password_manager/core/browser/password_manager.cc
|
||||
@@ -269,14 +269,14 @@ void MaybeNudgeToUpdateGMSCoreWhenSaving
|
||||
@@ -268,14 +268,14 @@ void MaybeNudgeToUpdateGMSCoreWhenSaving
|
||||
void PasswordManager::RegisterProfilePrefs(
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
--- a/chrome/browser/ui/startup/startup_tab_provider.cc
|
||||
+++ b/chrome/browser/ui/startup/startup_tab_provider.cc
|
||||
@@ -157,7 +157,7 @@ bool IsChromeControlledNtpUrl(const GURL
|
||||
|
||||
StartupTabs StartupTabProviderImpl::GetOnboardingTabs(Profile* profile) const {
|
||||
// Chrome OS has its own welcome flow provided by OOBE.
|
||||
-#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
+#if 1
|
||||
return StartupTabs();
|
||||
#else
|
||||
if (!profile || base::FeatureList::IsEnabled(kForYouFre)) {
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH 56/66] browser: disable profile auto-import on first run
|
||||
|
||||
--- a/chrome/browser/chrome_browser_main.cc
|
||||
+++ b/chrome/browser/chrome_browser_main.cc
|
||||
@@ -1647,11 +1647,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
@@ -1658,11 +1658,6 @@ int ChromeBrowserMainParts::PreMainMessa
|
||||
// and preferences have been registered since some of the import code depends
|
||||
// on preferences.
|
||||
if (first_run::IsChromeFirstRun()) {
|
||||
|
||||
@@ -29,7 +29,7 @@ TLDR: Do not let files sneak onto the disk too easily.
|
||||
|
||||
--- a/chrome/browser/download/download_prefs.cc
|
||||
+++ b/chrome/browser/download/download_prefs.cc
|
||||
@@ -274,7 +274,7 @@ void DownloadPrefs::RegisterProfilePrefs
|
||||
@@ -272,7 +272,7 @@ void DownloadPrefs::RegisterProfilePrefs
|
||||
user_prefs::PrefRegistrySyncable* registry) {
|
||||
registry->RegisterBooleanPref(
|
||||
prefs::kPromptForDownload,
|
||||
|
||||
@@ -16,7 +16,7 @@ the case anyway, since we are based off Chromium, not Chrome.
|
||||
|
||||
--- a/chrome/browser/app_controller_mac.mm
|
||||
+++ b/chrome/browser/app_controller_mac.mm
|
||||
@@ -990,7 +990,7 @@ class AppControllerNativeThemeObserver :
|
||||
@@ -1059,7 +1059,7 @@ class AppControllerNativeThemeObserver :
|
||||
CFStringRef checkInterval = CFSTR("checkInterval");
|
||||
CFPropertyListRef plist = CFPreferencesCopyAppValue(checkInterval, app);
|
||||
if (!plist) {
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
--- a/chrome/browser/ui/browser.cc
|
||||
+++ b/chrome/browser/ui/browser.cc
|
||||
@@ -142,6 +142,8 @@
|
||||
#include "chrome/browser/ui/tabs/tab_utils.h"
|
||||
#include "chrome/browser/ui/ui_features.h"
|
||||
@@ -144,6 +144,7 @@
|
||||
#include "chrome/browser/ui/unload_controller.h"
|
||||
+#include "chrome/browser/ui/views/frame/browser_view.h"
|
||||
#include "chrome/browser/ui/views/frame/browser_view.h"
|
||||
#include "chrome/browser/ui/views/frame/contents_web_view.h"
|
||||
+#include "chrome/browser/ui/views/message_box_dialog.h"
|
||||
#include "chrome/browser/ui/web_applications/app_browser_controller.h"
|
||||
#include "chrome/browser/ui/web_applications/web_app_launch_utils.h"
|
||||
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
|
||||
@@ -491,6 +493,7 @@ Browser::Browser(const CreateParams& par
|
||||
@@ -530,6 +531,7 @@ Browser::Browser(const CreateParams& par
|
||||
omit_from_session_restore_(params.omit_from_session_restore),
|
||||
should_trigger_session_restore_(params.should_trigger_session_restore),
|
||||
cancel_download_confirmation_state_(NOT_PROMPTED),
|
||||
@@ -17,15 +16,16 @@
|
||||
override_bounds_(params.initial_bounds),
|
||||
initial_show_state_(params.initial_show_state),
|
||||
initial_workspace_(params.initial_workspace),
|
||||
@@ -895,6 +898,7 @@ Browser::WarnBeforeClosingResult Browser
|
||||
// true or there are no pending downloads we need to prompt about) then
|
||||
// there's no need to warn.
|
||||
if (force_skip_warning_user_on_close_ || CanCloseWithInProgressDownloads())
|
||||
+ if (CanCloseWithMultipleTabs())
|
||||
return WarnBeforeClosingResult::kOkToClose;
|
||||
@@ -933,6 +935,8 @@ std::u16string Browser::FormatTitleForDi
|
||||
|
||||
DCHECK(!warn_before_closing_callback_)
|
||||
@@ -931,6 +935,7 @@ bool Browser::TryToCloseWindow(
|
||||
Browser::WarnBeforeClosingResult Browser::MaybeWarnBeforeClosing(
|
||||
Browser::WarnBeforeClosingCallback warn_callback) {
|
||||
+ if (!CanCloseWithMultipleTabs())
|
||||
+ return WarnBeforeClosingResult::kDoNotClose;
|
||||
// If the browser can close right away (we've indicated that we want to skip
|
||||
// before-unload handlers by setting `force_skip_warning_user_on_close_` to
|
||||
// true or there are no pending downloads we need to prompt about) then
|
||||
@@ -992,6 +996,7 @@ bool Browser::TryToCloseWindow(
|
||||
|
||||
void Browser::ResetTryToCloseWindow() {
|
||||
cancel_download_confirmation_state_ = NOT_PROMPTED;
|
||||
@@ -33,7 +33,7 @@
|
||||
unload_controller_.ResetTryToCloseWindow();
|
||||
}
|
||||
|
||||
@@ -2968,6 +2973,62 @@ bool Browser::CanCloseWithInProgressDown
|
||||
@@ -3008,6 +3013,58 @@ bool Browser::CanCloseWithInProgressDown
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -77,10 +77,6 @@
|
||||
+
|
||||
+ close_multitab_confirmation_state_ = WAITING_FOR_RESPONSE;
|
||||
+
|
||||
+ // The dialog eats mouse events which results in the close button
|
||||
+ // getting stuck in the hover state. Reset the window controls to
|
||||
+ // prevent this.
|
||||
+ ((BrowserView*)window_)->frame()->non_client_view()->ResetWindowControls();
|
||||
+ auto callback = base::BindOnce(&Browser::MultitabResponse,
|
||||
+ weak_factory_.GetWeakPtr());
|
||||
+ MessageBoxDialog::Show(window_->GetNativeWindow(),
|
||||
@@ -96,7 +92,7 @@
|
||||
void Browser::InProgressDownloadResponse(bool cancel_downloads) {
|
||||
if (cancel_downloads) {
|
||||
cancel_download_confirmation_state_ = RESPONSE_RECEIVED;
|
||||
@@ -2986,6 +3047,22 @@ void Browser::InProgressDownloadResponse
|
||||
@@ -3033,6 +3090,22 @@ void Browser::InProgressDownloadResponse
|
||||
|
||||
std::move(warn_before_closing_callback_)
|
||||
.Run(WarnBeforeClosingResult::kDoNotClose);
|
||||
@@ -118,18 +114,18 @@
|
||||
+ .Run(WarnBeforeClosingResult::kDoNotClose);
|
||||
}
|
||||
|
||||
void Browser::FinishWarnBeforeClosing(WarnBeforeClosingResult result) {
|
||||
void Browser::CookieMigrationNoticeResponse(bool proceed_closing) {
|
||||
--- a/chrome/browser/ui/browser.h
|
||||
+++ b/chrome/browser/ui/browser.h
|
||||
@@ -28,6 +28,7 @@
|
||||
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper_observer.h"
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "chrome/browser/ui/browser_navigator_params.h"
|
||||
#include "chrome/browser/ui/browser_window/public/browser_window_interface.h"
|
||||
#include "chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h"
|
||||
+#include "chrome/browser/ui/simple_message_box.h"
|
||||
#include "chrome/browser/ui/signin/signin_view_controller.h"
|
||||
#include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
|
||||
#include "chrome/browser/ui/unload_controller.h"
|
||||
@@ -1169,12 +1170,17 @@ class Browser : public TabStripModelObse
|
||||
@@ -1168,12 +1169,17 @@ class Browser : public TabStripModelObse
|
||||
// Returns true if the window can close, false otherwise.
|
||||
bool CanCloseWithInProgressDownloads();
|
||||
|
||||
@@ -144,10 +140,10 @@
|
||||
|
||||
+ void MultitabResponse(chrome::MessageBoxResult result);
|
||||
+
|
||||
// Called when all warnings have completed when attempting to close the
|
||||
// browser directly (e.g. via hotkey, close button, terminate signal, etc.)
|
||||
// Used as a WarnBeforeClosingCallback by HandleBeforeClose().
|
||||
@@ -1342,6 +1348,8 @@ class Browser : public TabStripModelObse
|
||||
// Called when the user has decided whether to proceed or not with the browser
|
||||
// closure, in case the cookie migration notice was shown. |proceed_closing|
|
||||
// is true if the browser can be closed.
|
||||
@@ -1346,6 +1352,8 @@ class Browser : public TabStripModelObse
|
||||
// when the browser is closed with in-progress downloads.
|
||||
CancelDownloadConfirmationState cancel_download_confirmation_state_;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/chrome_content_browser_client.cc
|
||||
+++ b/chrome/browser/chrome_content_browser_client.cc
|
||||
@@ -881,10 +881,14 @@ bool HandleNewTabPageLocationOverride(
|
||||
@@ -886,10 +886,14 @@ bool HandleNewTabPageLocationOverride(
|
||||
|
||||
// Don't change the URL when incognito mode.
|
||||
if (profile->IsOffTheRecord())
|
||||
|
||||
@@ -11,15 +11,15 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -199,6 +199,8 @@ BASE_FEATURE(kAutofillSendUnidentifiedKe
|
||||
"AutofillSendUnidentifiedKeyAfterFill",
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
@@ -20,6 +20,8 @@
|
||||
namespace blink {
|
||||
namespace features {
|
||||
|
||||
+BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
+
|
||||
// Apply lazy-loading to ad frames which have embeds likely impacting Core Web
|
||||
// Vitals.
|
||||
BASE_FEATURE(kAutomaticLazyFrameLoadingToAds,
|
||||
// -----------------------------------------------------------------------------
|
||||
// Feature definitions and associated constants (feature params, et cetera)
|
||||
//
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
@@ -20,6 +20,8 @@
|
||||
@@ -50,7 +50,7 @@
|
||||
Node* inner_node = event.InnerNode();
|
||||
--- a/third_party/blink/renderer/core/input/mouse_event_manager.cc
|
||||
+++ b/third_party/blink/renderer/core/input/mouse_event_manager.cc
|
||||
@@ -649,8 +649,14 @@ WebInputEventResult MouseEventManager::H
|
||||
@@ -648,8 +648,14 @@ WebInputEventResult MouseEventManager::H
|
||||
|
||||
bool single_click = event.Event().click_count <= 1;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
|
||||
@@ -67,6 +67,7 @@ class FrameGrabHandle : public views::Vi
|
||||
@@ -72,6 +72,7 @@ class FrameGrabHandle : public views::Vi
|
||||
// Reserve some space for the frame to be grabbed by, even if the tabstrip
|
||||
// is full.
|
||||
// TODO(tbergquist): Define this relative to the NTB insets again.
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "ui/gfx/color_utils.h"
|
||||
#include "ui/native_theme/native_theme.h"
|
||||
|
||||
@@ -441,7 +442,9 @@ void NTPResourceCache::CreateNewTabIncog
|
||||
@@ -416,7 +417,9 @@ void NTPResourceCache::CreateNewTabIncog
|
||||
profile_->GetPrefs()->GetString(prefs::kCurrentThemeID);
|
||||
|
||||
// Colors.
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
#include "base/feature_list.h"
|
||||
#include "base/format_macros.h"
|
||||
#include "base/functional/bind.h"
|
||||
@@ -418,6 +419,15 @@ AutocompleteController::AutocompleteCont
|
||||
@@ -501,6 +502,15 @@ AutocompleteController::AutocompleteCont
|
||||
steady_state_omnibox_position_(
|
||||
metrics::OmniboxEventProto::UNKNOWN_POSITION) {
|
||||
provider_types &= ~OmniboxFieldTrial::GetDisabledProviderTypes();
|
||||
@@ -59,7 +59,7 @@
|
||||
// so their async requests can be kicked off before waiting a few milliseconds
|
||||
--- a/components/omnibox/browser/history_url_provider.cc
|
||||
+++ b/components/omnibox/browser/history_url_provider.cc
|
||||
@@ -479,6 +479,9 @@ void HistoryURLProvider::Start(const Aut
|
||||
@@ -487,6 +487,9 @@ void HistoryURLProvider::Start(const Aut
|
||||
if (fixed_up_input.type() != metrics::OmniboxInputType::QUERY)
|
||||
matches_.push_back(what_you_typed_match);
|
||||
|
||||
@@ -91,8 +91,8 @@
|
||||
if (minimal_changes)
|
||||
--- a/components/url_formatter/url_fixer.cc
|
||||
+++ b/components/url_formatter/url_fixer.cc
|
||||
@@ -7,6 +7,8 @@
|
||||
#include <stddef.h>
|
||||
@@ -9,6 +9,8 @@
|
||||
#include <string_view>
|
||||
|
||||
#include "base/check_op.h"
|
||||
+#include "base/containers/contains.h"
|
||||
@@ -100,7 +100,7 @@
|
||||
#include "base/files/file_path.h"
|
||||
#include "base/files/file_util.h"
|
||||
#include "base/i18n/char_iterator.h"
|
||||
@@ -621,6 +623,8 @@ GURL FixupURLInternal(const std::string&
|
||||
@@ -620,6 +622,8 @@ GURL FixupURLInternal(const std::string&
|
||||
|
||||
FixupHost(trimmed, parts.host, parts.scheme.is_valid(), desired_tld, &url);
|
||||
if (chrome_url && !parts.host.is_valid())
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/tab_helpers.cc
|
||||
+++ b/chrome/browser/ui/tab_helpers.cc
|
||||
@@ -486,7 +486,9 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
@@ -501,7 +501,9 @@ void TabHelpers::AttachTabHelpers(WebCon
|
||||
resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents(
|
||||
web_contents);
|
||||
SafetyTipWebContentsObserver::CreateForWebContents(web_contents);
|
||||
@@ -60,7 +60,7 @@
|
||||
#include "base/containers/contains.h"
|
||||
#include "base/containers/flat_map.h"
|
||||
#include "base/debug/crash_logging.h"
|
||||
@@ -207,6 +208,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
|
||||
@@ -209,6 +210,12 @@ TemplateURL MergeEnterpriseSiteSearchEng
|
||||
return TemplateURL(merged_data);
|
||||
}
|
||||
|
||||
@@ -73,7 +73,7 @@
|
||||
} // namespace
|
||||
|
||||
// TemplateURLService::LessWithPrefix -----------------------------------------
|
||||
@@ -389,6 +396,7 @@ TemplateURLService::TemplateURLService(
|
||||
@@ -391,6 +398,7 @@ TemplateURLService::TemplateURLService(
|
||||
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
)
|
||||
: prefs_(prefs),
|
||||
@@ -81,7 +81,7 @@
|
||||
search_engine_choice_service_(search_engine_choice_service),
|
||||
search_terms_data_(std::move(search_terms_data)),
|
||||
web_data_service_(web_data_service),
|
||||
@@ -527,8 +535,8 @@ bool TemplateURLService::CanAddAutogener
|
||||
@@ -529,8 +537,8 @@ bool TemplateURLService::CanAddAutogener
|
||||
// that may interfere with search queries). An easy heuristic for this is
|
||||
// whether the user has a TemplateURL that has been manually modified (e.g.,
|
||||
// renamed) connected to the same host.
|
||||
@@ -92,7 +92,7 @@
|
||||
}
|
||||
|
||||
bool TemplateURLService::IsPrepopulatedOrDefaultProviderByPolicy(
|
||||
@@ -1926,6 +1934,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
@@ -2061,6 +2069,8 @@ SyncDataMap TemplateURLService::CreateGU
|
||||
}
|
||||
|
||||
void TemplateURLService::Init() {
|
||||
@@ -101,7 +101,7 @@
|
||||
if (client_)
|
||||
client_->SetOwner(this);
|
||||
|
||||
@@ -2101,6 +2111,9 @@ void TemplateURLService::ChangeToLoadedS
|
||||
@@ -2236,6 +2246,9 @@ void TemplateURLService::ChangeToLoadedS
|
||||
|
||||
bool TemplateURLService::CanAddAutogeneratedKeywordForHost(
|
||||
const std::string& host) const {
|
||||
@@ -113,7 +113,7 @@
|
||||
return true;
|
||||
--- a/components/search_engines/template_url_service.h
|
||||
+++ b/components/search_engines/template_url_service.h
|
||||
@@ -881,6 +881,8 @@ class TemplateURLService final : public
|
||||
@@ -893,6 +893,8 @@ class TemplateURLService final : public
|
||||
raw_ptr<search_engines::SearchEngineChoiceService>
|
||||
search_engine_choice_service_ = nullptr;
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/debug/alias.h"
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/i18n/rtl.h"
|
||||
@@ -698,6 +699,8 @@ void Tab::OnGestureEvent(ui::GestureEven
|
||||
@@ -706,6 +707,8 @@ void Tab::OnGestureEvent(ui::GestureEven
|
||||
}
|
||||
|
||||
std::u16string Tab::GetTooltipText(const gfx::Point& p) const {
|
||||
@@ -24,10 +24,10 @@
|
||||
#include <vector>
|
||||
|
||||
+#include "base/command_line.h"
|
||||
#include "base/check.h"
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/containers/adapters.h"
|
||||
#include "base/containers/contains.h"
|
||||
@@ -1764,6 +1765,8 @@ void TabStrip::OnMouseEventInTab(views::
|
||||
@@ -1794,6 +1795,8 @@ void TabStrip::OnMouseEventInTab(views::
|
||||
}
|
||||
|
||||
void TabStrip::UpdateHoverCard(Tab* tab, HoverCardUpdateType update_type) {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/browser_command_controller.cc
|
||||
+++ b/chrome/browser/ui/browser_command_controller.cc
|
||||
@@ -1415,7 +1415,8 @@ void BrowserCommandController::InitComma
|
||||
@@ -1426,7 +1426,8 @@ void BrowserCommandController::InitComma
|
||||
command_updater_.UpdateCommandEnabled(IDC_WINDOW_CLOSE_OTHER_TABS,
|
||||
normal_window);
|
||||
|
||||
@@ -40,7 +40,7 @@
|
||||
#include "base/functional/bind.h"
|
||||
#include "base/strings/utf_string_conversions.h"
|
||||
#include "build/build_config.h"
|
||||
@@ -98,7 +99,8 @@ TabStripRegionView::TabStripRegionView(s
|
||||
@@ -104,7 +105,8 @@ TabStripRegionView::TabStripRegionView(s
|
||||
|
||||
// Add and configure the TabSearchContainer.
|
||||
std::unique_ptr<TabSearchContainer> tab_search_container;
|
||||
@@ -48,8 +48,8 @@
|
||||
+ if (browser && browser->is_type_normal() &&
|
||||
+ !base::CommandLine::ForCurrentProcess()->HasSwitch("remove-tabsearch-button")) {
|
||||
tab_search_container = std::make_unique<TabSearchContainer>(
|
||||
tab_strip_->controller(), render_tab_search_before_tab_strip_, this);
|
||||
tab_search_container->SetProperty(views::kCrossAxisAlignmentKey,
|
||||
tab_strip_->controller(), browser->tab_strip_model(),
|
||||
render_tab_search_before_tab_strip_, this);
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -60,4 +60,8 @@
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/browser_features.cc
|
||||
+++ b/chrome/browser/browser_features.cc
|
||||
@@ -422,4 +422,5 @@ BASE_FEATURE(kWebUsbDeviceDetection,
|
||||
@@ -415,4 +415,5 @@ BASE_FEATURE(kWebUsbDeviceDetection,
|
||||
"WebUsbDeviceDetection",
|
||||
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||
|
||||
@@ -8,8 +8,8 @@
|
||||
} // namespace features
|
||||
--- a/chrome/browser/browser_features.h
|
||||
+++ b/chrome/browser/browser_features.h
|
||||
@@ -157,6 +157,7 @@ BASE_DECLARE_FEATURE(kUseOsCryptAsyncFor
|
||||
|
||||
@@ -153,6 +153,7 @@ BASE_DECLARE_FEATURE(kTabCaptureBlueBord
|
||||
BASE_DECLARE_FEATURE(kUseOsCryptAsyncForCookieEncryption);
|
||||
BASE_DECLARE_FEATURE(kWebUsbDeviceDetection);
|
||||
|
||||
+BASE_DECLARE_FEATURE(kClearDataOnExit);
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/tabs/tab_strip_model.cc
|
||||
+++ b/chrome/browser/ui/tabs/tab_strip_model.cc
|
||||
@@ -11,6 +11,7 @@
|
||||
@@ -12,6 +12,7 @@
|
||||
#include <unordered_map>
|
||||
#include <utility>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
#include "base/containers/adapters.h"
|
||||
#include "base/containers/contains.h"
|
||||
#include "base/containers/flat_map.h"
|
||||
@@ -2088,6 +2089,10 @@ void TabStripModel::CloseTabs(base::span
|
||||
@@ -2224,6 +2225,10 @@ void TabStripModel::CloseTabs(base::span
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
bool IsExtensionDownload(const download::DownloadItem& download_item);
|
||||
--- a/chrome/browser/download/download_target_determiner.cc
|
||||
+++ b/chrome/browser/download/download_target_determiner.cc
|
||||
@@ -1192,10 +1192,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
@@ -1191,10 +1191,12 @@ DownloadConfirmationReason DownloadTarge
|
||||
return DownloadConfirmationReason::SAVE_AS;
|
||||
|
||||
#if BUILDFLAG(ENABLE_EXTENSIONS)
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "base/compiler_specific.h"
|
||||
#include "base/containers/flat_set.h"
|
||||
#include "base/feature_list.h"
|
||||
@@ -1317,7 +1318,8 @@ void HistoryBackend::InitImpl(
|
||||
@@ -1319,7 +1320,8 @@ void HistoryBackend::InitImpl(
|
||||
db_->GetStartDate(&first_recorded_time_);
|
||||
|
||||
// Start expiring old stuff.
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/components/url_formatter/url_formatter.cc
|
||||
+++ b/components/url_formatter/url_formatter.cc
|
||||
@@ -9,6 +9,7 @@
|
||||
@@ -10,6 +10,7 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
#include "base/lazy_instance.h"
|
||||
#include "base/memory/raw_ptr.h"
|
||||
#include "base/numerics/safe_conversions.h"
|
||||
@@ -311,6 +312,13 @@ IDNConversionResult IDNToUnicodeWithAdju
|
||||
@@ -312,6 +313,13 @@ IDNConversionResult IDNToUnicodeWithAdju
|
||||
host16.reserve(host.length());
|
||||
host16.insert(host16.end(), host.begin(), host.end());
|
||||
|
||||
@@ -33,5 +33,5 @@
|
||||
+ }
|
||||
+
|
||||
// Compute the top level domain to be used in spoof checks later.
|
||||
base::StringPiece top_level_domain;
|
||||
std::string_view top_level_domain;
|
||||
std::u16string top_level_domain_unicode;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/startup/infobar_utils.cc
|
||||
+++ b/chrome/browser/ui/startup/infobar_utils.cc
|
||||
@@ -120,7 +120,8 @@ void AddInfoBarsIfNecessary(Browser* bro
|
||||
@@ -123,7 +123,8 @@ void AddInfoBarsIfNecessary(Browser* bro
|
||||
}
|
||||
|
||||
// Web apps should not display the session restore bubble (crbug.com/1264121)
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
#include "chrome/common/pref_names.h"
|
||||
#include "chrome/grit/generated_resources.h"
|
||||
#include "components/feature_engagement/public/event_constants.h"
|
||||
@@ -528,6 +530,17 @@ void ExtensionsToolbarContainer::AnchorA
|
||||
@@ -537,6 +539,17 @@ void ExtensionsToolbarContainer::AnchorA
|
||||
widget->widget_delegate()->AsBubbleDialogDelegate()->SetAnchorView(
|
||||
anchor_view && anchor_view->GetVisible() ? anchor_view
|
||||
: GetExtensionsButton());
|
||||
@@ -34,7 +34,7 @@
|
||||
widget->Show();
|
||||
}
|
||||
|
||||
@@ -936,6 +949,9 @@ void ExtensionsToolbarContainer::UpdateC
|
||||
@@ -945,6 +958,9 @@ void ExtensionsToolbarContainer::UpdateC
|
||||
}
|
||||
|
||||
bool ExtensionsToolbarContainer::ShouldContainerBeVisible() const {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
--- a/chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -1960,6 +1960,10 @@ void BrowserView::UpdateExclusiveAccessE
|
||||
ExclusiveAccessBubbleHideCallback bubble_first_hide_callback,
|
||||
bool notify_download,
|
||||
bool force_update) {
|
||||
@@ -1961,6 +1961,10 @@ void BrowserView::ExitFullscreen() {
|
||||
void BrowserView::UpdateExclusiveAccessBubble(
|
||||
const ExclusiveAccessBubbleParams& params,
|
||||
ExclusiveAccessBubbleHideCallback first_hide_callback) {
|
||||
+ if (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
||||
+ "hide-fullscreen-exit-ui"))
|
||||
+ return;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -452,7 +452,8 @@ void ToolbarView::Init() {
|
||||
@@ -461,7 +461,8 @@ void ToolbarView::Init() {
|
||||
send_tab_to_self_button_ =
|
||||
container_view_->AddChildView(std::move(send_tab_to_self_button));
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/tabs/tab.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab.cc
|
||||
@@ -1070,7 +1070,11 @@ void Tab::UpdateIconVisibility() {
|
||||
@@ -1079,7 +1079,11 @@ void Tab::UpdateIconVisibility() {
|
||||
if (IsActive()) {
|
||||
// Close button is shown on active tabs regardless of the size.
|
||||
showing_close_button_ = true;
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
showing_alert_indicator_ =
|
||||
has_alert_icon && alert_icon_width <= available_width;
|
||||
@@ -1095,6 +1099,8 @@ void Tab::UpdateIconVisibility() {
|
||||
@@ -1104,6 +1108,8 @@ void Tab::UpdateIconVisibility() {
|
||||
}
|
||||
|
||||
showing_close_button_ = large_enough_for_close_button;
|
||||
|
||||
@@ -0,0 +1,80 @@
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -132,4 +132,8 @@
|
||||
"Minimal Referrers",
|
||||
"Removes all cross-origin referrers and strips same-origin referrers down to the origin. Has lower precedence than remove-cross-origin-referrers. ungoogled-chromium flag.",
|
||||
kOsAll, FEATURE_VALUE_TYPE(features::kMinimalReferrers)},
|
||||
+ {"reduced-system-info",
|
||||
+ "Reduced System Info",
|
||||
+ "Reduces the amount of system information obatainable through headers and javascript, also causes hardwareConcurrency to respond with two cores. ungoogled-chromium flag.",
|
||||
+ kOsAll, FEATURE_VALUE_TYPE(blink::features::kReducedSystemInfo)},
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/components/embedder_support/user_agent_utils.cc
|
||||
+++ b/components/embedder_support/user_agent_utils.cc
|
||||
@@ -143,6 +143,8 @@ const std::string& GetWindowsPlatformVer
|
||||
// TODO(crbug.com/1330890): Remove this method along with policy.
|
||||
bool ShouldReduceUserAgentMinorVersion(
|
||||
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
|
||||
+ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo))
|
||||
+ return true;
|
||||
return ((user_agent_reduction !=
|
||||
UserAgentReductionEnterprisePolicyState::kForceDisabled &&
|
||||
base::FeatureList::IsEnabled(
|
||||
@@ -166,6 +168,8 @@ bool ShouldReduceUserAgentMinorVersion(
|
||||
// sending unified platform for the user agent string.
|
||||
bool ShouldSendUserAgentUnifiedPlatform(
|
||||
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
|
||||
+ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo))
|
||||
+ return true;
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
return ShouldReduceUserAgentMinorVersion(user_agent_reduction) &&
|
||||
base::FeatureList::IsEnabled(
|
||||
@@ -456,6 +460,8 @@ blink::UserAgentMetadata GetUserAgentMet
|
||||
|
||||
blink::UserAgentMetadata GetUserAgentMetadata(const PrefService* pref_service,
|
||||
bool only_low_entropy_ch) {
|
||||
+ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo))
|
||||
+ only_low_entropy_ch = true;
|
||||
blink::UserAgentMetadata metadata;
|
||||
|
||||
bool enable_updated_grease_by_policy = true;
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -21,6 +21,7 @@ namespace blink {
|
||||
namespace features {
|
||||
|
||||
BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
+BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Feature definitions and associated constants (feature params, et cetera)
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
@@ -21,6 +21,7 @@ namespace blink {
|
||||
namespace features {
|
||||
|
||||
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableLinkDrag);
|
||||
+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kReducedSystemInfo);
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Feature declarations and associated constants (feature params, et cetera)
|
||||
--- a/third_party/blink/renderer/core/execution_context/navigator_base.cc
|
||||
+++ b/third_party/blink/renderer/core/execution_context/navigator_base.cc
|
||||
@@ -69,6 +69,8 @@ String NavigatorBase::platform() const {
|
||||
}
|
||||
#endif
|
||||
|
||||
+ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo))
|
||||
+ return GetReducedNavigatorPlatform();
|
||||
return NavigatorID::platform();
|
||||
}
|
||||
|
||||
@@ -80,6 +82,8 @@ void NavigatorBase::Trace(Visitor* visit
|
||||
}
|
||||
|
||||
unsigned int NavigatorBase::hardwareConcurrency() const {
|
||||
+ if (base::FeatureList::IsEnabled(blink::features::kReducedSystemInfo))
|
||||
+ return 2;
|
||||
unsigned int hardware_concurrency =
|
||||
NavigatorConcurrentHardware::hardwareConcurrency();
|
||||
|
||||
@@ -0,0 +1,70 @@
|
||||
--- a/chrome/browser/ungoogled_flag_entries.h
|
||||
+++ b/chrome/browser/ungoogled_flag_entries.h
|
||||
@@ -136,4 +136,8 @@
|
||||
"Reduced System Info",
|
||||
"Reduces the amount of system information obatainable through headers and javascript, also causes hardwareConcurrency to respond with two cores. ungoogled-chromium flag.",
|
||||
kOsAll, FEATURE_VALUE_TYPE(blink::features::kReducedSystemInfo)},
|
||||
+ {"remove-client-hints",
|
||||
+ "Remove Client Hints",
|
||||
+ "Removes client hints (information sent to servers about your system, similar to a user agent). ungoogled-chromium flag.",
|
||||
+ kOsAll, FEATURE_VALUE_TYPE(blink::features::kRemoveClientHints)},
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/content/browser/client_hints/client_hints.cc
|
||||
+++ b/content/browser/client_hints/client_hints.cc
|
||||
@@ -836,6 +836,8 @@ void UpdateNavigationRequestClientUaHead
|
||||
net::HttpRequestHeaders* headers,
|
||||
const std::optional<GURL>& request_url) {
|
||||
DCHECK(frame_tree_node);
|
||||
+ if (base::FeatureList::IsEnabled(blink::features::kRemoveClientHints))
|
||||
+ return;
|
||||
if (!ShouldAddClientHints(origin, frame_tree_node, delegate, request_url)) {
|
||||
return;
|
||||
}
|
||||
@@ -857,6 +859,8 @@ void AddRequestClientHintsHeaders(
|
||||
FrameTreeNode* frame_tree_node,
|
||||
const blink::ParsedPermissionsPolicy& container_policy,
|
||||
const std::optional<GURL>& request_url) {
|
||||
+ if (base::FeatureList::IsEnabled(blink::features::kRemoveClientHints))
|
||||
+ return;
|
||||
ClientHintsExtendedData data(origin, frame_tree_node, delegate, request_url);
|
||||
UpdateIFramePermissionsPolicyWithDelegationSupportForClientHints(
|
||||
data, container_policy);
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -22,6 +22,7 @@ namespace features {
|
||||
|
||||
BASE_FEATURE(kDisableLinkDrag, "DisableLinkDrag", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
BASE_FEATURE(kReducedSystemInfo, "ReducedSystemInfo", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
+BASE_FEATURE(kRemoveClientHints, "RemoveClientHints", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Feature definitions and associated constants (feature params, et cetera)
|
||||
--- a/third_party/blink/public/common/features.h
|
||||
+++ b/third_party/blink/public/common/features.h
|
||||
@@ -22,6 +22,7 @@ namespace features {
|
||||
|
||||
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kDisableLinkDrag);
|
||||
BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kReducedSystemInfo);
|
||||
+BLINK_COMMON_EXPORT BASE_DECLARE_FEATURE(kRemoveClientHints);
|
||||
|
||||
// -----------------------------------------------------------------------------
|
||||
// Feature declarations and associated constants (feature params, et cetera)
|
||||
--- a/third_party/blink/renderer/core/frame/navigator_ua.cc
|
||||
+++ b/third_party/blink/renderer/core/frame/navigator_ua.cc
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "third_party/blink/renderer/core/frame/navigator_ua.h"
|
||||
|
||||
#include "base/compiler_specific.h"
|
||||
+#include "third_party/blink/public/common/features.h"
|
||||
#include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
|
||||
#include "third_party/blink/renderer/core/frame/navigator_ua_data.h"
|
||||
#include "third_party/blink/renderer/platform/wtf/text/wtf_string.h"
|
||||
@@ -12,6 +13,8 @@
|
||||
namespace blink {
|
||||
|
||||
NavigatorUAData* NavigatorUA::userAgentData() {
|
||||
+ if (base::FeatureList::IsEnabled(blink::features::kRemoveClientHints))
|
||||
+ return nullptr;
|
||||
NavigatorUAData* ua_data =
|
||||
MakeGarbageCollected<NavigatorUAData>(GetUAExecutionContext());
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
// tabstrip, or the empty space beside the tabstrip.
|
||||
--- a/chrome/browser/ui/views/frame/browser_root_view.h
|
||||
+++ b/chrome/browser/ui/views/frame/browser_root_view.h
|
||||
@@ -161,6 +161,8 @@ class BrowserRootView : public views::in
|
||||
@@ -162,6 +162,8 @@ class BrowserRootView : public views::in
|
||||
int scroll_remainder_x_ = 0;
|
||||
int scroll_remainder_y_ = 0;
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
|
||||
@@ -476,6 +476,17 @@ void ToolbarView::Init() {
|
||||
@@ -485,6 +485,17 @@ void ToolbarView::Init() {
|
||||
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
show_avatar_toolbar_button = !chromeos::IsManagedGuestSession();
|
||||
#endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -3919,10 +3919,12 @@ const FeatureEntry::FeatureVariation kDe
|
||||
@@ -3855,10 +3855,12 @@ const FeatureEntry::FeatureVariation kCo
|
||||
#include "chrome/browser/ungoogled_flag_choices.h"
|
||||
#include "chrome/browser/bromite_flag_choices.h"
|
||||
#include "chrome/browser/ungoogled_platform_flag_choices.h"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
#endif // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -159,6 +159,8 @@ static_library("common_lib") {
|
||||
@@ -158,6 +158,8 @@ static_library("common_lib") {
|
||||
"pref_names_util.cc",
|
||||
"pref_names_util.h",
|
||||
"ref_counted_util.h",
|
||||
@@ -28,7 +28,7 @@
|
||||
"search/instant_mojom_traits.h",
|
||||
"search/instant_types.cc",
|
||||
"search/instant_types.h",
|
||||
@@ -268,6 +270,7 @@ static_library("common_lib") {
|
||||
@@ -270,6 +272,7 @@ static_library("common_lib") {
|
||||
"//components/no_state_prefetch/common:mojo_bindings",
|
||||
"//components/page_load_metrics/common:common",
|
||||
"//components/pdf/common:constants",
|
||||
@@ -38,7 +38,7 @@
|
||||
if (is_android || enable_library_cdms) {
|
||||
--- a/chrome/common/chrome_features.cc
|
||||
+++ b/chrome/common/chrome_features.cc
|
||||
@@ -990,6 +990,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
|
||||
@@ -967,6 +967,14 @@ BASE_FEATURE(kNewFilesPolicyUX,
|
||||
// referrers instead of their ordinary behavior.
|
||||
BASE_FEATURE(kNoReferrers, "NoReferrers", base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
// on-screen until dismissed, they are instead shown for a very long time.
|
||||
--- a/chrome/common/chrome_features.h
|
||||
+++ b/chrome/common/chrome_features.h
|
||||
@@ -601,6 +601,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
|
||||
@@ -576,6 +576,10 @@ BASE_DECLARE_FEATURE(kNewFilesPolicyUX);
|
||||
|
||||
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kNoReferrers);
|
||||
|
||||
@@ -173,7 +173,7 @@
|
||||
disallowed_extension_deps_ = [
|
||||
# Components should largely not depend on //extensions. Since // extensions
|
||||
# is not a component target and is linked with //chrome, depending on most
|
||||
@@ -839,7 +839,7 @@ test("components_unittests") {
|
||||
@@ -843,7 +843,7 @@ test("components_unittests") {
|
||||
# On other platforms, no components should depend on Chrome.
|
||||
# Since //chrome depends on //extensions, we also only assert_no_deps on
|
||||
# extensions targets for non-lacros builds.
|
||||
@@ -182,7 +182,7 @@
|
||||
assert_no_deps = [ "//chrome/*" ]
|
||||
assert_no_deps += disallowed_extension_deps_
|
||||
}
|
||||
@@ -1124,7 +1124,7 @@ if (use_blink) {
|
||||
@@ -1129,7 +1129,7 @@ if (use_blink) {
|
||||
# dependency. On other platforms, no components should depend on Chrome.
|
||||
# Since //chrome depends on //extensions, we also only assert_no_deps on
|
||||
# extensions targets for non-lacros builds.
|
||||
@@ -193,7 +193,7 @@
|
||||
}
|
||||
--- a/content/browser/renderer_host/navigation_request.cc
|
||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||
@@ -42,6 +42,7 @@
|
||||
@@ -41,6 +41,7 @@
|
||||
#include "build/build_config.h"
|
||||
#include "build/buildflag.h"
|
||||
#include "build/chromeos_buildflags.h"
|
||||
@@ -201,7 +201,7 @@
|
||||
#include "components/viz/host/host_frame_sink_manager.h"
|
||||
#include "content/browser/blob_storage/chrome_blob_storage_context.h"
|
||||
#include "content/browser/browsing_topics/header_util.h"
|
||||
@@ -385,10 +386,10 @@ void AddAdditionalRequestHeaders(
|
||||
@@ -386,10 +387,10 @@ void AddAdditionalRequestHeaders(
|
||||
net::HttpRequestHeaders::kUserAgent,
|
||||
ComputeUserAgentValue(*headers, user_agent_override, browser_context));
|
||||
|
||||
@@ -226,7 +226,7 @@
|
||||
#include "content/common/associated_interfaces.mojom.h"
|
||||
#include "content/common/content_navigation_policy.h"
|
||||
#include "content/common/content_switches_internal.h"
|
||||
@@ -4542,10 +4543,13 @@ void RenderFrameImpl::WillSendRequestInt
|
||||
@@ -4547,10 +4548,13 @@ void RenderFrameImpl::WillSendRequestInt
|
||||
|
||||
request.SetHasUserGesture(frame_->HasTransientUserActivation());
|
||||
|
||||
@@ -246,7 +246,7 @@
|
||||
void RenderFrameImpl::DidLoadResourceFromMemoryCache(
|
||||
--- a/content/shell/BUILD.gn
|
||||
+++ b/content/shell/BUILD.gn
|
||||
@@ -280,6 +280,7 @@ static_library("content_shell_lib") {
|
||||
@@ -315,6 +315,7 @@ static_library("content_shell_lib") {
|
||||
"//base:base_static",
|
||||
"//build:chromeos_buildflags",
|
||||
"//cc/base",
|
||||
@@ -355,7 +355,7 @@
|
||||
WebVector<std::unique_ptr<URLLoaderThrottle>>
|
||||
--- a/tools/v8_context_snapshot/BUILD.gn
|
||||
+++ b/tools/v8_context_snapshot/BUILD.gn
|
||||
@@ -82,6 +82,7 @@ if (use_v8_context_snapshot) {
|
||||
@@ -83,6 +83,7 @@ if (use_v8_context_snapshot) {
|
||||
sources = [ "v8_context_snapshot_generator.cc" ]
|
||||
|
||||
deps = [
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
// True if |hostname| ends with either ".local" or ".local.".
|
||||
bool ResemblesMulticastDNSName(std::string_view hostname) {
|
||||
return hostname.ends_with(".local") || hostname.ends_with(".local.");
|
||||
@@ -1388,33 +1383,10 @@ int HostResolverManager::StartIPv6Reacha
|
||||
@@ -1429,33 +1424,10 @@ int HostResolverManager::StartIPv6Reacha
|
||||
return OK;
|
||||
}
|
||||
|
||||
|
||||
@@ -270,7 +270,7 @@
|
||||
bool CanEdit(const TemplateURL* url) const;
|
||||
--- a/chrome/browser/ui/search_engines/template_url_table_model.cc
|
||||
+++ b/chrome/browser/ui/search_engines/template_url_table_model.cc
|
||||
@@ -191,21 +191,25 @@ void TemplateURLTableModel::Remove(size_
|
||||
@@ -200,21 +200,25 @@ void TemplateURLTableModel::Remove(size_
|
||||
void TemplateURLTableModel::Add(size_t index,
|
||||
const std::u16string& short_name,
|
||||
const std::u16string& keyword,
|
||||
@@ -301,7 +301,7 @@
|
||||
DCHECK(index <= RowCount());
|
||||
DCHECK(!url.empty());
|
||||
TemplateURL* template_url = GetTemplateURL(index);
|
||||
@@ -214,7 +218,8 @@ void TemplateURLTableModel::ModifyTempla
|
||||
@@ -223,7 +227,8 @@ void TemplateURLTableModel::ModifyTempla
|
||||
DCHECK(template_url_service_->GetDefaultSearchProvider() != template_url ||
|
||||
template_url->SupportsReplacement(
|
||||
template_url_service_->search_terms_data()));
|
||||
@@ -313,7 +313,7 @@
|
||||
TemplateURL* TemplateURLTableModel::GetTemplateURL(size_t index) {
|
||||
--- a/chrome/browser/ui/search_engines/template_url_table_model.h
|
||||
+++ b/chrome/browser/ui/search_engines/template_url_table_model.h
|
||||
@@ -58,13 +58,15 @@ class TemplateURLTableModel : public ui:
|
||||
@@ -61,13 +61,15 @@ class TemplateURLTableModel : public ui:
|
||||
void Add(size_t index,
|
||||
const std::u16string& short_name,
|
||||
const std::u16string& keyword,
|
||||
@@ -341,7 +341,7 @@
|
||||
|
||||
// Dummy number used for indicating that a new search engine is added.
|
||||
const int kNewSearchEngineIndex = -1;
|
||||
@@ -223,6 +224,8 @@ base::Value::Dict SearchEnginesHandler::
|
||||
@@ -222,6 +223,8 @@ base::Value::Dict SearchEnginesHandler::
|
||||
Profile* profile = Profile::FromWebUI(web_ui());
|
||||
dict.Set("url",
|
||||
template_url->url_ref().DisplayURL(UIThreadSearchTermsData()));
|
||||
@@ -350,7 +350,7 @@
|
||||
dict.Set("urlLocked", ((template_url->prepopulate_id() > 0) ||
|
||||
(template_url->starter_pack_id() > 0)));
|
||||
GURL icon_url = template_url->favicon_url();
|
||||
@@ -364,12 +367,14 @@ void SearchEnginesHandler::HandleSearchE
|
||||
@@ -363,12 +366,14 @@ void SearchEnginesHandler::HandleSearchE
|
||||
void SearchEnginesHandler::OnEditedKeyword(TemplateURL* template_url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
@@ -368,7 +368,7 @@
|
||||
|
||||
edit_controller_.reset();
|
||||
}
|
||||
@@ -397,6 +402,8 @@ bool SearchEnginesHandler::CheckFieldVal
|
||||
@@ -396,6 +401,8 @@ bool SearchEnginesHandler::CheckFieldVal
|
||||
is_valid = edit_controller_->IsKeywordValid(base::UTF8ToUTF16(field_value));
|
||||
else if (field_name.compare(kQueryUrlField) == 0)
|
||||
is_valid = edit_controller_->IsURLValid(field_value);
|
||||
@@ -377,7 +377,7 @@
|
||||
else
|
||||
NOTREACHED();
|
||||
|
||||
@@ -416,18 +423,21 @@ void SearchEnginesHandler::HandleSearchE
|
||||
@@ -415,18 +422,21 @@ void SearchEnginesHandler::HandleSearchE
|
||||
if (!edit_controller_.get())
|
||||
return;
|
||||
|
||||
@@ -427,7 +427,7 @@
|
||||
|
||||
--- a/components/search_engines/template_url_service.cc
|
||||
+++ b/components/search_engines/template_url_service.cc
|
||||
@@ -862,7 +862,8 @@ void TemplateURLService::IncrementUsageC
|
||||
@@ -916,7 +916,8 @@ void TemplateURLService::IncrementUsageC
|
||||
void TemplateURLService::ResetTemplateURL(TemplateURL* url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
@@ -437,7 +437,7 @@
|
||||
DCHECK(!IsCreatedByExtension(url));
|
||||
DCHECK(!keyword.empty());
|
||||
DCHECK(!search_url.empty());
|
||||
@@ -877,6 +878,7 @@ void TemplateURLService::ResetTemplateUR
|
||||
@@ -931,6 +932,7 @@ void TemplateURLService::ResetTemplateUR
|
||||
data.safe_for_autoreplace = false;
|
||||
data.last_modified = clock_->Now();
|
||||
data.is_active = TemplateURLData::ActiveStatus::kTrue;
|
||||
@@ -447,7 +447,7 @@
|
||||
}
|
||||
--- a/components/search_engines/template_url_service.h
|
||||
+++ b/components/search_engines/template_url_service.h
|
||||
@@ -308,7 +308,8 @@ class TemplateURLService final : public
|
||||
@@ -316,7 +316,8 @@ class TemplateURLService final : public
|
||||
void ResetTemplateURL(TemplateURL* url,
|
||||
const std::u16string& title,
|
||||
const std::u16string& keyword,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -3915,7 +3915,13 @@ const FeatureEntry::FeatureVariation kDe
|
||||
@@ -3851,7 +3851,13 @@ const FeatureEntry::FeatureVariation kCo
|
||||
// calculate and verify checksum.
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
|
||||
@@ -1,29 +1,23 @@
|
||||
--- a/chrome/browser/media/webrtc/capture_policy_utils.cc
|
||||
+++ b/chrome/browser/media/webrtc/capture_policy_utils.cc
|
||||
@@ -241,89 +241,13 @@ void RegisterProfilePrefs(PrefRegistrySi
|
||||
}
|
||||
|
||||
bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) {
|
||||
-// TODO(b/40272166): Implement for Lacros.
|
||||
-#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
- policy::MultiScreenCapturePolicyService* multi_capture_policy_service =
|
||||
- policy::MultiScreenCapturePolicyServiceFactory::GetForBrowserContext(
|
||||
- context);
|
||||
- if (!multi_capture_policy_service) {
|
||||
- return false;
|
||||
@@ -63,46 +63,7 @@ void IsMultiCaptureAllowedForAnyOriginOn
|
||||
base::OnceCallback<void(bool)> callback,
|
||||
content::BrowserContext* context,
|
||||
bool is_multi_capture_allowed_for_any_origin_on_main_profile) {
|
||||
- // If the new MultiScreenCaptureAllowedForUrls policy permits access, exit
|
||||
- // early. If not, check the legacy
|
||||
- // GetDisplayMediaSetSelectAllScreensAllowedForUrls policy.
|
||||
- if (is_multi_capture_allowed_for_any_origin_on_main_profile) {
|
||||
- std::move(callback).Run(true);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
- if (multi_capture_policy_service->GetAllowListSize() > 0u) {
|
||||
- return true;
|
||||
- }
|
||||
-#endif // BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
-
|
||||
-// TODO(b/329064666): Remove the checks below once the pivot to IWAs is
|
||||
-// complete.
|
||||
-#if BUILDFLAG(IS_CHROMEOS)
|
||||
- // TODO(b/329064666): Remove the checks below once the pivot to IWAs is
|
||||
- // complete.
|
||||
- Profile* profile = Profile::FromBrowserContext(context);
|
||||
- if (!profile) {
|
||||
- return false;
|
||||
- std::move(callback).Run(false);
|
||||
- return;
|
||||
- }
|
||||
-
|
||||
-#if BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
@@ -31,26 +25,48 @@
|
||||
- // screens can happen (for privacy reasons), this API is only available on
|
||||
- // primary profiles.
|
||||
- if (!profile->IsMainProfile()) {
|
||||
- return false;
|
||||
- std::move(callback).Run(false);
|
||||
- return;
|
||||
- }
|
||||
-#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
-
|
||||
- HostContentSettingsMap* host_content_settings_map =
|
||||
- HostContentSettingsMapFactory::GetForProfile(profile);
|
||||
- if (!host_content_settings_map) {
|
||||
- return false;
|
||||
std::move(callback).Run(false);
|
||||
- return;
|
||||
- }
|
||||
- ContentSettingsForOneType content_settings =
|
||||
- host_content_settings_map->GetSettingsForOneType(
|
||||
- ContentSettingsType::ALL_SCREEN_CAPTURE);
|
||||
- return base::ranges::any_of(content_settings,
|
||||
- [](const ContentSettingPatternSource& source) {
|
||||
- return source.GetContentSetting() ==
|
||||
- ContentSetting::CONTENT_SETTING_ALLOW;
|
||||
- });
|
||||
- std::move(callback).Run(base::ranges::any_of(
|
||||
- content_settings, [](const ContentSettingPatternSource& source) {
|
||||
- return source.GetContentSetting() ==
|
||||
- ContentSetting::CONTENT_SETTING_ALLOW;
|
||||
- }));
|
||||
}
|
||||
|
||||
void CheckAllScreensMediaAllowedForIwaResultReceived(
|
||||
@@ -290,58 +251,13 @@ void RegisterProfilePrefs(PrefRegistrySi
|
||||
void CheckGetAllScreensMediaAllowedForAnyOrigin(
|
||||
content::BrowserContext* context,
|
||||
base::OnceCallback<void(bool)> callback) {
|
||||
-#if BUILDFLAG(IS_CHROMEOS)
|
||||
- if (crosapi::mojom::MultiCaptureService* multi_capture_service =
|
||||
- GetMultiCaptureService()) {
|
||||
- multi_capture_service->IsMultiCaptureAllowedForAnyOriginOnMainProfile(
|
||||
- base::BindOnce(
|
||||
- IsMultiCaptureAllowedForAnyOriginOnMainProfileResultReceived,
|
||||
- std::move(callback), context));
|
||||
- } else {
|
||||
- // If the multi capture service is not available with the required version,
|
||||
- // fall back to the original flow using the deprecated policy.
|
||||
- IsMultiCaptureAllowedForAnyOriginOnMainProfileResultReceived(
|
||||
- std::move(callback), context, /*result=*/false);
|
||||
- }
|
||||
-#else
|
||||
return false;
|
||||
-#endif
|
||||
std::move(callback).Run(false);
|
||||
-#endif // BUILDFLAG(IS_CHROMEOS)
|
||||
}
|
||||
|
||||
void CheckGetAllScreensMediaAllowed(content::BrowserContext* context,
|
||||
@@ -76,12 +92,12 @@
|
||||
- GetMultiCaptureService();
|
||||
- if (multi_capture_service) {
|
||||
- multi_capture_service->IsMultiCaptureAllowed(
|
||||
- url, base::BindOnce(&IsGetAllScreensMediaAllowedForIwaResultReceived,
|
||||
- url, base::BindOnce(&CheckAllScreensMediaAllowedForIwaResultReceived,
|
||||
- std::move(callback), std::move(url), context));
|
||||
- } else {
|
||||
- // If the multi capture service is not available with the required version,
|
||||
- // fall back to the original flow using the deprecated policy.
|
||||
- IsGetAllScreensMediaAllowedForIwaResultReceived(
|
||||
- CheckAllScreensMediaAllowedForIwaResultReceived(
|
||||
- std::move(callback), std::move(url), context, /*result=*/false);
|
||||
- }
|
||||
-#else
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/components/download/internal/common/base_file.cc
|
||||
+++ b/components/download/internal/common/base_file.cc
|
||||
@@ -22,7 +22,6 @@
|
||||
@@ -23,7 +23,6 @@
|
||||
#include "components/download/public/common/download_interrupt_reasons_utils.h"
|
||||
#include "components/download/public/common/download_item.h"
|
||||
#include "components/download/public/common/download_stats.h"
|
||||
@@ -10,7 +10,7 @@
|
||||
#include "crypto/secure_hash.h"
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID)
|
||||
@@ -525,94 +524,10 @@ DownloadInterruptReason BaseFile::Publis
|
||||
@@ -526,94 +525,10 @@ DownloadInterruptReason BaseFile::Publis
|
||||
}
|
||||
#endif // BUILDFLAG(IS_ANDROID)
|
||||
|
||||
@@ -105,7 +105,7 @@
|
||||
}
|
||||
|
||||
void BaseFile::AnnotateWithSourceInformation(
|
||||
@@ -621,32 +536,8 @@ void BaseFile::AnnotateWithSourceInforma
|
||||
@@ -622,32 +537,8 @@ void BaseFile::AnnotateWithSourceInforma
|
||||
const GURL& referrer_url,
|
||||
mojo::PendingRemote<quarantine::mojom::Quarantine> remote_quarantine,
|
||||
OnAnnotationDoneCallback on_annotation_done_callback) {
|
||||
@@ -142,7 +142,7 @@
|
||||
} // namespace download
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -96,7 +96,6 @@ source_set("browser") {
|
||||
@@ -98,7 +98,6 @@ source_set("browser") {
|
||||
"//components/payments/mojom",
|
||||
"//components/power_monitor",
|
||||
"//components/services/filesystem:lib",
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
--- a/components/url_formatter/url_formatter.cc
|
||||
+++ b/components/url_formatter/url_formatter.cc
|
||||
@@ -533,15 +533,15 @@ bool HasTwoViewSourceSchemes(base::Strin
|
||||
@@ -534,15 +534,15 @@ bool HasTwoViewSourceSchemes(std::string
|
||||
} // namespace
|
||||
|
||||
const FormatUrlType kFormatUrlOmitNothing = 0;
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
--- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
|
||||
+++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
|
||||
@@ -3869,8 +3869,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -3865,8 +3865,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
pname, IdentifiabilityBenignStringToken(
|
||||
String(ContextGL()->GetString(GL_RENDERER))));
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
}
|
||||
SynthesizeGLError(
|
||||
GL_INVALID_ENUM, "getParameter",
|
||||
@@ -3884,8 +3883,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
@@ -3880,8 +3879,7 @@ ScriptValue WebGLRenderingContextBase::g
|
||||
pname, IdentifiabilityBenignStringToken(
|
||||
String(ContextGL()->GetString(GL_VENDOR))));
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/third_party/blink/common/features.cc
|
||||
+++ b/third_party/blink/common/features.cc
|
||||
@@ -1792,7 +1792,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
|
||||
@@ -1814,7 +1814,7 @@ BASE_FEATURE(kPrefetchFontLookupTables,
|
||||
// crbug.com/988956.
|
||||
BASE_FEATURE(kPrefetchPrivacyChanges,
|
||||
"PrefetchPrivacyChanges",
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/browser_commands.cc
|
||||
+++ b/chrome/browser/ui/browser_commands.cc
|
||||
@@ -551,11 +551,6 @@ int GetContentRestrictions(const Browser
|
||||
@@ -557,11 +557,6 @@ int GetContentRestrictions(const Browser
|
||||
CoreTabHelper* core_tab_helper =
|
||||
CoreTabHelper::FromWebContents(current_tab);
|
||||
content_restrictions = core_tab_helper->content_restrictions();
|
||||
@@ -14,7 +14,7 @@
|
||||
}
|
||||
return content_restrictions;
|
||||
}
|
||||
@@ -1698,8 +1693,7 @@ bool CanSavePage(const Browser* browser)
|
||||
@@ -1704,8 +1699,7 @@ bool CanSavePage(const Browser* browser)
|
||||
DownloadPrefs::DownloadRestriction::ALL_FILES) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
--- a/chrome/browser/ui/views/frame/tab_strip_region_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/tab_strip_region_view.cc
|
||||
@@ -196,12 +196,10 @@ TabStripRegionView::TabStripRegionView(s
|
||||
@@ -193,12 +193,10 @@ TabStripRegionView::TabStripRegionView(s
|
||||
|
||||
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
|
||||
// TODO(crbug.com/40118868): Revisit the macro expression once build flag
|
||||
// switch of lacros-chrome is complete.
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
|
||||
// The New Tab Button can be middle-clicked on Linux.
|
||||
@@ -15,16 +15,16 @@
|
||||
reserved_grab_handle_space_ =
|
||||
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
|
||||
@@ -2001,8 +2001,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
@@ -2023,8 +2023,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
|
||||
const ui::MouseEvent& mouse = static_cast<const ui::MouseEvent&>(event);
|
||||
if (mouse.IsOnlyMiddleMouseButton()) {
|
||||
- if (ui::Clipboard::IsSupportedClipboardBuffer(
|
||||
- ui::ClipboardBuffer::kSelection)) {
|
||||
ui::Clipboard* clipboard = ui::Clipboard::GetForCurrentThread();
|
||||
CHECK(clipboard);
|
||||
std::u16string clipboard_text;
|
||||
@@ -2011,7 +2009,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
CHECK(clipboard)
|
||||
<< "Clipboard instance is not available, cannot proceed with "
|
||||
@@ -2035,7 +2033,6 @@ void TabStrip::NewTabButtonPressed(const
|
||||
if (!clipboard_text.empty()) {
|
||||
controller_->CreateNewTabWithLocation(clipboard_text);
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/chrome/browser/chrome_browser_main.cc
|
||||
+++ b/chrome/browser/chrome_browser_main.cc
|
||||
@@ -1086,6 +1086,7 @@ int ChromeBrowserMainParts::PreCreateThr
|
||||
@@ -1097,6 +1097,7 @@ int ChromeBrowserMainParts::PreCreateThr
|
||||
if (first_run::IsChromeFirstRun()) {
|
||||
if (!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kApp) &&
|
||||
!base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kAppId)) {
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
|
||||
@@ -63,6 +63,7 @@
|
||||
@@ -58,6 +58,7 @@
|
||||
#include "chrome/browser/ui/webui/suggest_internals/suggest_internals_ui.h"
|
||||
#include "chrome/browser/ui/webui/sync_internals/sync_internals_ui.h"
|
||||
#include "chrome/browser/ui/webui/translate_internals/translate_internals_ui.h"
|
||||
@@ -18,7 +18,7 @@
|
||||
#include "chrome/browser/ui/webui/usb_internals/usb_internals_ui.h"
|
||||
#include "chrome/browser/ui/webui/user_actions/user_actions_ui.h"
|
||||
#include "chrome/browser/ui/webui/version/version_ui.h"
|
||||
@@ -809,6 +810,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
|
||||
@@ -779,6 +780,8 @@ WebUIFactoryFunction GetWebUIFactoryFunc
|
||||
return &NewWebUI<privacy_sandbox_internals::PrivacySandboxInternalsUI>;
|
||||
}
|
||||
|
||||
@@ -169,7 +169,7 @@
|
||||
+#endif // CHROME_BROWSER_UI_WEBUI_UNGOOGLED_FIRST_RUN_H_
|
||||
--- a/chrome/common/webui_url_constants.cc
|
||||
+++ b/chrome/common/webui_url_constants.cc
|
||||
@@ -671,6 +671,7 @@ const char kExtensionConfigureCommandsSu
|
||||
@@ -672,6 +672,7 @@ const char kExtensionConfigureCommandsSu
|
||||
// Add hosts here to be included in chrome://chrome-urls (about:about).
|
||||
// These hosts will also be suggested by BuiltinProvider.
|
||||
const char* const kChromeHostURLs[] = {
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
+++ b/chrome/browser/ui/startup/bad_flags_prompt.cc
|
||||
@@ -74,7 +74,6 @@ const char* const kBadFlags[] = {
|
||||
@@ -75,7 +75,6 @@ const char* const kBadFlags[] = {
|
||||
// These flags disable sandbox-related security.
|
||||
sandbox::policy::switches::kDisableGpuSandbox,
|
||||
sandbox::policy::switches::kDisableSeccompFilterSandbox,
|
||||
|
||||
@@ -23,16 +23,17 @@
|
||||
# the feedback entry in the third party cookie popup
|
||||
# unneeded elements from the profile menu
|
||||
# the 'Learn more' link on crashed tabs
|
||||
# the new profile menu bubble
|
||||
# the Third-party sign-in site settings (FedCM)
|
||||
# disable LiveCaption flag by default, this also removes non-functional Live Caption checkbox from media controls
|
||||
# the new feature badges
|
||||
|
||||
--- a/chrome/browser/resources/extensions/item_list.html
|
||||
+++ b/chrome/browser/resources/extensions/item_list.html
|
||||
@@ -106,13 +106,6 @@
|
||||
<h2 class="extension-title-container">$i18n{safetyCheckAllExtensions}</h2>
|
||||
</template>
|
||||
</div>
|
||||
@@ -114,13 +114,6 @@
|
||||
</div>
|
||||
</template>
|
||||
|
||||
- <div id="no-items" class="empty-list-message"
|
||||
- hidden$="[[!shouldShowEmptyItemsMessage_(
|
||||
- apps.length, extensions.length)]]">
|
||||
@@ -100,20 +101,20 @@
|
||||
declare global {
|
||||
--- a/chrome/browser/resources/history/side_bar.html
|
||||
+++ b/chrome/browser/resources/history/side_bar.html
|
||||
@@ -87,13 +87,6 @@
|
||||
@@ -88,13 +88,6 @@
|
||||
$i18n{historyMenuItem}
|
||||
<cr-ripple></cr-ripple>
|
||||
</a>
|
||||
- <a id="syncedTabs" role="menuitem" href="/syncedTabs"
|
||||
- class="page-item cr-nav-menu-item"
|
||||
- path="syncedTabs" on-click="onItemClick_">
|
||||
- <iron-icon icon="cr:phonelink"></iron-icon>
|
||||
- <cr-icon icon="cr:phonelink"></cr-icon>
|
||||
- $i18n{openTabsMenuItem}
|
||||
- <cr-ripple></cr-ripple>
|
||||
- </a>
|
||||
<!-- tabindex is needed below because <a> without href attribute is not
|
||||
focusable in sequential keyboard navigation by default. -->
|
||||
<a role="menuitem" id="clear-browsing-data"
|
||||
<template is="dom-if" if="[[productSpecificationsListsEnabled_]]">
|
||||
<a id="productSpecificationsLists" role="menuitem"
|
||||
href="/productSpecificationsLists"
|
||||
--- a/chrome/browser/resources/new_tab_page_incognito_guest/incognito_tab.html
|
||||
+++ b/chrome/browser/resources/new_tab_page_incognito_guest/incognito_tab.html
|
||||
@@ -24,9 +24,6 @@ document.querySelector('#incognitothemec
|
||||
@@ -183,7 +184,7 @@
|
||||
<div class="separator"></div>
|
||||
--- a/chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
||||
+++ b/chrome/browser/resources/settings/appearance_page/appearance_page.ts
|
||||
@@ -412,8 +412,8 @@ export class SettingsAppearancePageEleme
|
||||
@@ -421,8 +421,8 @@ export class SettingsAppearancePageEleme
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -193,7 +194,7 @@
|
||||
switch (this.systemTheme_) {
|
||||
case SystemTheme.GTK:
|
||||
i18nId = 'gtkTheme';
|
||||
@@ -425,11 +425,8 @@ export class SettingsAppearancePageEleme
|
||||
@@ -434,11 +434,8 @@ export class SettingsAppearancePageEleme
|
||||
i18nId = 'classicTheme';
|
||||
break;
|
||||
}
|
||||
@@ -224,13 +225,22 @@
|
||||
+++ b/chrome/browser/resources/settings/basic_page/basic_page.html
|
||||
@@ -47,7 +47,7 @@
|
||||
</settings-section>
|
||||
<!-- TODO(crbug/1469277): Remove after SafetyHub launched. -->
|
||||
<!-- TODO(crbug.com/40277421): Remove after SafetyHub launched. -->
|
||||
<template is="dom-if"
|
||||
- if="[[showSafetyCheckPage_(pageVisibility.safetyCheck)]]" restamp>
|
||||
+ if="[[false]]" restamp>
|
||||
<settings-section page-title="$i18n{safetyCheckSectionTitle}"
|
||||
section="safetyCheck" nest-under-section="privacy"
|
||||
id="safetyCheckSettingsSection">
|
||||
@@ -59,7 +59,7 @@
|
||||
to check that settings-safety-hub-entry-point is not visible
|
||||
in the guest mode. -->
|
||||
<template is="dom-if"
|
||||
- if="[[showSafetyHubEntryPointPage_(pageVisibility.safetyHub)]]"
|
||||
+ if="[[false]]"
|
||||
restamp>
|
||||
<settings-section page-title="$i18n{safetyHub}"
|
||||
section="safetyHubEntryPoint" nest-under-section="privacy"
|
||||
--- a/chrome/browser/resources/settings/basic_page/basic_page.ts
|
||||
+++ b/chrome/browser/resources/settings/basic_page/basic_page.ts
|
||||
@@ -12,7 +12,6 @@ import 'chrome://resources/cr_elements/c
|
||||
@@ -267,7 +277,7 @@
|
||||
class="hr"
|
||||
--- a/chrome/browser/resources/settings/privacy_page/personalization_options.ts
|
||||
+++ b/chrome/browser/resources/settings/privacy_page/personalization_options.ts
|
||||
@@ -214,10 +214,6 @@ export class SettingsPersonalizationOpti
|
||||
@@ -215,10 +215,6 @@ export class SettingsPersonalizationOpti
|
||||
'chrome-signin-user-choice-info-change',
|
||||
this.setChromeSigninUserChoiceInfo_.bind(this));
|
||||
// </if>
|
||||
@@ -335,7 +345,7 @@
|
||||
aria-description="$i18n{opensInNewTab}" on-click="onHelpClick_">
|
||||
--- a/chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
+++ b/chrome/browser/ui/toolbar/app_menu_model.cc
|
||||
@@ -857,19 +857,9 @@ void ExtensionsMenuModel::Build(Browser*
|
||||
@@ -857,16 +857,6 @@ void ExtensionsMenuModel::Build(Browser*
|
||||
SetElementIdentifierAt(
|
||||
GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS).value(),
|
||||
kManageExtensionsMenuItem);
|
||||
@@ -345,19 +355,16 @@
|
||||
- GetIndexOfCommandId(IDC_EXTENSIONS_SUBMENU_VISIT_CHROME_WEB_STORE)
|
||||
- .value(),
|
||||
- kVisitChromeWebStoreMenuItem);
|
||||
if (features::IsChromeRefresh2023()) {
|
||||
SetCommandIcon(this, IDC_EXTENSIONS_SUBMENU_MANAGE_EXTENSIONS,
|
||||
vector_icons::kExtensionChromeRefreshIcon);
|
||||
-#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
|
||||
- SetCommandIcon(this, IDC_EXTENSIONS_SUBMENU_VISIT_CHROME_WEB_STORE,
|
||||
- vector_icons::kGoogleChromeWebstoreIcon);
|
||||
- SetCommandIcon(this, IDC_EXTENSIONS_SUBMENU_VISIT_CHROME_WEB_STORE,
|
||||
- vector_icons::kGoogleChromeWebstoreIcon);
|
||||
-#endif
|
||||
}
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
--- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
||||
+++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc
|
||||
@@ -639,13 +639,6 @@ void BookmarkMenuDelegate::BuildMenu(con
|
||||
@@ -645,13 +645,6 @@ void BookmarkMenuDelegate::BuildMenu(con
|
||||
kBookmarksSidePanelIcon, ui::kColorMenuIcon,
|
||||
ui::SimpleMenuModel::kDefaultIconSize)
|
||||
: ui::ImageModel();
|
||||
@@ -388,7 +395,7 @@
|
||||
|
||||
--- a/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
+++ b/chrome/browser/ui/views/profiles/profile_menu_view.cc
|
||||
@@ -187,6 +187,7 @@ void ProfileMenuView::BuildMenu() {
|
||||
@@ -188,6 +188,7 @@ void ProfileMenuView::BuildMenu() {
|
||||
}
|
||||
|
||||
gfx::ImageSkia ProfileMenuView::GetSyncIcon() const {
|
||||
@@ -396,23 +403,19 @@
|
||||
Profile* profile = browser()->profile();
|
||||
if (profile->IsOffTheRecord() || profile->IsGuestSession())
|
||||
return gfx::ImageSkia();
|
||||
@@ -578,15 +579,7 @@ void ProfileMenuView::BuildIdentity() {
|
||||
ui::ImageModel::FromImage(account_info.account_image),
|
||||
@@ -588,12 +589,6 @@ void ProfileMenuView::BuildIdentity() {
|
||||
badge_image_model, menu_title_, menu_subtitle_, management_label);
|
||||
} else {
|
||||
- if (switches::IsExplicitBrowserSigninUIOnDesktopEnabled(
|
||||
- switches::ExplicitBrowserSigninPhase::kExperimental) &&
|
||||
- !switches::IsExplicitBrowserSigninUIOnDesktopEnabled(
|
||||
- switches::ExplicitBrowserSigninPhase::kFull) &&
|
||||
- account.IsEmpty()) {
|
||||
- account_info =
|
||||
- signin_ui_util::GetSingleAccountForPromos(identity_manager);
|
||||
- }
|
||||
- menu_title_ = l10n_util::GetStringUTF16(IDS_PROFILES_LOCAL_PROFILE_STATE);
|
||||
+ menu_title_ = std::u16string();
|
||||
// The email may be empty.
|
||||
menu_subtitle_ = base::UTF8ToUTF16(account_info.email);
|
||||
std::u16string management_label;
|
||||
std::string profile_user_display_name, profile_user_email;
|
||||
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
|
||||
- profile_user_display_name = profile->GetPrefs()->GetString(
|
||||
- enterprise_signin::prefs::kProfileUserDisplayName);
|
||||
- profile_user_email = profile->GetPrefs()->GetString(
|
||||
- enterprise_signin::prefs::kProfileUserEmail);
|
||||
-#endif
|
||||
menu_title_ =
|
||||
profile_user_display_name.empty()
|
||||
? l10n_util::GetStringUTF16(IDS_PROFILES_LOCAL_PROFILE_STATE)
|
||||
--- a/chrome/browser/ui/views/sad_tab_view.cc
|
||||
+++ b/chrome/browser/ui/views/sad_tab_view.cc
|
||||
@@ -559,9 +559,6 @@ SadTabView::SadTabView(content::WebConte
|
||||
@@ -448,9 +451,30 @@
|
||||
|
||||
void SadTabView::OnBoundsChanged(const gfx::Rect& previous_bounds) {
|
||||
// Specify the maximum message and title width explicitly.
|
||||
--- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc
|
||||
+++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc
|
||||
@@ -667,18 +667,6 @@ void MaybeRegisterChromeFeaturePromos(
|
||||
}
|
||||
|
||||
if (features::IsSidePanelPinningEnabled()) {
|
||||
- // kIPHSidePanelGenericMenuFeature:
|
||||
- registry.RegisterFeature(std::move(
|
||||
- FeaturePromoSpecification::CreateForToastPromo(
|
||||
- feature_engagement::kIPHSidePanelGenericMenuFeature,
|
||||
- kToolbarAppMenuButtonElementId, IDS_SIDE_PANEL_GENERIC_MENU_IPH,
|
||||
- IDS_SIDE_PANEL_GENERIC_MENU_IPH_SCREENREADER,
|
||||
- FeaturePromoSpecification::AcceleratorInfo())
|
||||
- .SetBubbleArrow(HelpBubbleArrow::kTopRight)
|
||||
- .SetMetadata(121, "corising@chromium.org",
|
||||
- "Triggered on startup for discovery of "
|
||||
- "side panel entry points in app menu.")));
|
||||
-
|
||||
// kIPHSidePanelGenericPinnableFeature:
|
||||
registry.RegisterFeature(std::move(
|
||||
FeaturePromoSpecification::CreateForToastPromo(
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -3238,7 +3238,7 @@ void AddSiteSettingsStrings(content::Web
|
||||
@@ -3331,7 +3331,7 @@ void AddSiteSettingsStrings(content::Web
|
||||
base::FeatureList::IsEnabled(blink::features::kWebPrinting));
|
||||
|
||||
html_source->AddBoolean("enableFederatedIdentityApiContentSetting",
|
||||
@@ -461,7 +485,7 @@
|
||||
html_source->AddBoolean(
|
||||
--- a/media/base/media_switches.cc
|
||||
+++ b/media/base/media_switches.cc
|
||||
@@ -938,7 +938,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
|
||||
@@ -927,7 +927,7 @@ BASE_FEATURE(kOnDeviceWebSpeech,
|
||||
base::FEATURE_DISABLED_BY_DEFAULT);
|
||||
|
||||
// Enables the Live Caption feature on supported devices.
|
||||
@@ -472,7 +496,7 @@
|
||||
// getDisplayMedia captures. Note: This flag does not control if the "Share this
|
||||
--- a/ui/views/controls/menu/menu_item_view.cc
|
||||
+++ b/ui/views/controls/menu/menu_item_view.cc
|
||||
@@ -824,7 +824,7 @@ void MenuItemView::SetAlerted() {
|
||||
@@ -826,7 +826,7 @@ void MenuItemView::SetAlerted() {
|
||||
}
|
||||
|
||||
bool MenuItemView::ShouldShowNewBadge() const {
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
upstream-fixes/missing-dependencies.patch
|
||||
|
||||
core/inox-patchset/0001-fix-building-without-safebrowsing.patch
|
||||
core/inox-patchset/0003-disable-autofill-download-manager.patch
|
||||
core/inox-patchset/0005-disable-default-extensions.patch
|
||||
@@ -29,6 +31,8 @@ core/ungoogled-chromium/remove-unused-preferences-fields.patch
|
||||
core/ungoogled-chromium/block-requests.patch
|
||||
core/ungoogled-chromium/disable-privacy-sandbox.patch
|
||||
core/ungoogled-chromium/doh-changes.patch
|
||||
core/ungoogled-chromium/extensions-manifestv2.patch
|
||||
core/ungoogled-chromium/build-without-webnn.patch
|
||||
core/bromite/disable-fetching-field-trials.patch
|
||||
|
||||
extra/ungoogled-chromium/add-ungoogled-flag-headers.patch
|
||||
@@ -36,7 +40,6 @@ extra/inox-patchset/0006-modify-default-prefs.patch
|
||||
extra/inox-patchset/0008-restore-classic-ntp.patch
|
||||
extra/inox-patchset/0013-disable-missing-key-warning.patch
|
||||
extra/inox-patchset/0016-chromium-sandbox-pie.patch
|
||||
extra/inox-patchset/0018-disable-first-run-behaviour.patch
|
||||
extra/inox-patchset/0019-disable-battery-status-service.patch
|
||||
extra/debian/disable/google-api-warning.patch
|
||||
extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch
|
||||
@@ -101,3 +104,5 @@ extra/ungoogled-chromium/default-webrtc-ip-handling-policy.patch
|
||||
extra/ungoogled-chromium/add-flags-for-existing-switches.patch
|
||||
extra/ungoogled-chromium/first-run-page.patch
|
||||
extra/ungoogled-chromium/disable-capture-all-screens.patch
|
||||
extra/ungoogled-chromium/add-flag-to-reduce-system-info.patch
|
||||
extra/ungoogled-chromium/add-flag-to-remove-client-hints.patch
|
||||
|
||||
56
patches/upstream-fixes/missing-dependencies.patch
Normal file
56
patches/upstream-fixes/missing-dependencies.patch
Normal file
@@ -0,0 +1,56 @@
|
||||
--- a/chrome/browser/extensions/BUILD.gn
|
||||
+++ b/chrome/browser/extensions/BUILD.gn
|
||||
@@ -921,6 +921,7 @@ static_library("extensions") {
|
||||
"//components/resources",
|
||||
"//components/safe_browsing:buildflags",
|
||||
"//components/safe_browsing/content/browser/web_ui:web_ui",
|
||||
+ "//components/safe_browsing/content/common/proto:download_file_types_proto",
|
||||
"//components/safe_browsing/core/browser/db:database_manager",
|
||||
"//components/safe_browsing/core/common",
|
||||
"//components/safe_browsing/core/common:safe_browsing_prefs",
|
||||
--- a/chrome/common/BUILD.gn
|
||||
+++ b/chrome/common/BUILD.gn
|
||||
@@ -599,6 +599,7 @@ static_library("url_constants") {
|
||||
"//components/optimization_guide/optimization_guide_internals/webui:url_constants",
|
||||
"//components/password_manager/content/common",
|
||||
"//components/safe_browsing/core/common",
|
||||
+ "//components/supervised_user/core/common:buildflags",
|
||||
"//device/vr/buildflags",
|
||||
]
|
||||
}
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -72,6 +72,7 @@ source_set("browser") {
|
||||
"//cc/animation",
|
||||
"//cc/mojo_embedder",
|
||||
"//cc/paint",
|
||||
+ "//chrome/common:buildflags",
|
||||
"//components/attribution_reporting:mojom",
|
||||
"//components/back_forward_cache:enum",
|
||||
"//components/browsing_topics/common:common",
|
||||
@@ -82,6 +83,7 @@ source_set("browser") {
|
||||
"//components/download/public/common:public",
|
||||
"//components/file_access",
|
||||
"//components/filename_generation",
|
||||
+ "//components/lens:buildflags",
|
||||
"//components/link_header_util",
|
||||
"//components/metrics",
|
||||
"//components/metrics:single_sample_metrics",
|
||||
--- a/services/passage_embeddings/BUILD.gn
|
||||
+++ b/services/passage_embeddings/BUILD.gn
|
||||
@@ -31,6 +31,7 @@ source_set("passage_embeddings") {
|
||||
}
|
||||
|
||||
deps = [
|
||||
+ "//components/optimization_guide:machine_learning_tflite_buildflags",
|
||||
"//services/passage_embeddings/public/mojom",
|
||||
"//third_party/sentencepiece:sentencepiece",
|
||||
"//third_party/sentencepiece:sentencepiece_proto",
|
||||
@@ -38,7 +39,6 @@ source_set("passage_embeddings") {
|
||||
|
||||
if (build_with_tflite_lib) {
|
||||
deps += [
|
||||
- "//components/optimization_guide:machine_learning_tflite_buildflags",
|
||||
"//components/optimization_guide/core:machine_learning",
|
||||
]
|
||||
}
|
||||
57194
pruning.list
57194
pruning.list
File diff suppressed because it is too large
Load Diff
@@ -6,7 +6,7 @@
|
||||
# utilize a newer version of gsutil to support later versions of python
|
||||
--- a/gclient.py
|
||||
+++ b/gclient.py
|
||||
@@ -125,8 +125,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
|
||||
@@ -126,8 +126,8 @@ DEPOT_TOOLS_DIR = os.path.dirname(os.pat
|
||||
# one, e.g. if a spec explicitly says `cache_dir = None`.)
|
||||
UNSET_CACHE_DIR = object()
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
PREVIOUS_SYNC_COMMITS = 'GCLIENT_PREVIOUS_SYNC_COMMITS'
|
||||
|
||||
@@ -421,6 +421,7 @@ class Dependency(gclient_utils.WorkItem,
|
||||
@@ -424,6 +424,7 @@ class Dependency(gclient_utils.WorkItem,
|
||||
protocol='https',
|
||||
git_dependencies_state=gclient_eval.DEPS,
|
||||
print_outbuf=False):
|
||||
@@ -25,7 +25,7 @@
|
||||
gclient_utils.WorkItem.__init__(self, name)
|
||||
DependencySettings.__init__(self, parent, url, managed, custom_deps,
|
||||
custom_vars, custom_hooks, deps_file,
|
||||
@@ -729,6 +730,7 @@ class Dependency(gclient_utils.WorkItem,
|
||||
@@ -745,6 +746,7 @@ class Dependency(gclient_utils.WorkItem,
|
||||
|
||||
condition = dep_value.get('condition')
|
||||
dep_type = dep_value.get('dep_type')
|
||||
@@ -33,7 +33,7 @@
|
||||
|
||||
if condition and not self._get_option('process_all_deps', False):
|
||||
if condition not in cached_conditions:
|
||||
@@ -845,6 +847,8 @@ class Dependency(gclient_utils.WorkItem,
|
||||
@@ -877,6 +879,8 @@ class Dependency(gclient_utils.WorkItem,
|
||||
|
||||
self._gn_args_from = local_scope.get('gclient_gn_args_from')
|
||||
self._gn_args_file = local_scope.get('gclient_gn_args_file')
|
||||
@@ -44,7 +44,7 @@
|
||||
# to another DEPS will make gclient ignore any other local gn_args*
|
||||
--- a/gclient_scm.py
|
||||
+++ b/gclient_scm.py
|
||||
@@ -844,8 +844,7 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -929,8 +929,7 @@ class GitWrapper(SCMWrapper):
|
||||
self._SetFetchConfig(options)
|
||||
|
||||
# Fetch upstream if we don't already have |revision|.
|
||||
@@ -54,7 +54,7 @@
|
||||
self._Fetch(options, prune=options.force)
|
||||
|
||||
if not scm.GIT.IsValidRevision(
|
||||
@@ -861,7 +860,7 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -946,7 +945,7 @@ class GitWrapper(SCMWrapper):
|
||||
|
||||
# This is a big hammer, debatable if it should even be here...
|
||||
if options.force or options.reset:
|
||||
@@ -63,15 +63,15 @@
|
||||
if options.upstream and upstream_branch:
|
||||
target = upstream_branch
|
||||
self._Scrub(target, options)
|
||||
@@ -876,7 +875,6 @@ class GitWrapper(SCMWrapper):
|
||||
@@ -961,7 +960,6 @@ class GitWrapper(SCMWrapper):
|
||||
# to the checkout step.
|
||||
if not (options.force or options.reset):
|
||||
self._CheckClean(revision)
|
||||
- self._CheckDetachedHead(revision, options)
|
||||
if self._Capture(['rev-list', '-n', '1', 'HEAD']) == revision:
|
||||
self.Print('Up-to-date; skipping checkout.')
|
||||
else:
|
||||
@@ -1550,8 +1548,7 @@ class GitWrapper(SCMWrapper):
|
||||
|
||||
if not current_revision:
|
||||
current_revision = self._Capture(
|
||||
@@ -1641,8 +1639,7 @@ class GitWrapper(SCMWrapper):
|
||||
fetch_cmd.append('--no-tags')
|
||||
elif quiet:
|
||||
fetch_cmd.append('--quiet')
|
||||
@@ -83,7 +83,7 @@
|
||||
def _SetFetchConfig(self, options):
|
||||
--- a/gsutil.py
|
||||
+++ b/gsutil.py
|
||||
@@ -27,7 +27,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR,
|
||||
@@ -25,7 +25,7 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR,
|
||||
|
||||
IS_WINDOWS = os.name == 'nt'
|
||||
|
||||
|
||||
@@ -19,6 +19,7 @@ from _common import ENCODING, get_logger, add_common_params
|
||||
CONTINGENT_PATHS = (
|
||||
# Sources
|
||||
'third_party/angle/third_party/VK-GL-CTS/src/',
|
||||
'third_party/js_code_coverage/',
|
||||
'third_party/llvm/',
|
||||
'third_party/rust-src/',
|
||||
# Binaries
|
||||
|
||||
Reference in New Issue
Block a user