bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-16 12:10:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 115.0.5790.0 (#1148114)

Browse Source 
- Mac: 13.3 SDK (Xcode 14.3) is now required
This commit is contained in:
Marshall Greenblatt 2023-05-30 11:55:32 +03:00
parent cf8b7db4b4
commit 695ee2a041
83 changed files with 604 additions and 633 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BUILD.gn
View File

@ -1353,9 +1353,10 @@ make_pack_header("resources") {
"$root_gen_dir/content/browser/tracing/grit/tracing_resources.h",
"$root_gen_dir/content/browser/webrtc/resources/grit/webrtc_internals_resources.h",
"$root_gen_dir/content/grit/content_resources.h",
"$root_gen_dir/content/grit/dev_ui_content_resources.h",
"$root_gen_dir/content/grit/gpu_resources.h",
"$root_gen_dir/content/grit/histograms_resources.h",
"$root_gen_dir/content/grit/process_resources.h",
"$root_gen_dir/content/grit/service_worker_resources.h",
"$root_gen_dir/extensions/grit/extensions_browser_resources.h",
"$root_gen_dir/extensions/grit/extensions_renderer_resources.h",
"$root_gen_dir/extensions/grit/extensions_resources.h",
@ -1381,10 +1382,11 @@ make_pack_header("resources") {
"//content/browser/devtools:devtools_resources",
"//content/browser/resources/gpu:resources",
"//content/browser/resources/histograms:resources",
"//content/browser/resources/process:resources",
"//content/browser/resources/service_worker:resources",
"//content/browser/tracing:resources",
"//content/browser/webrtc/resources",
"//content:content_resources",
"//content:dev_ui_content_resources",
"//extensions:extensions_browser_resources",
"//extensions:extensions_renderer_resources",
"//extensions:extensions_resources_grd",

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@ -7,5 +7,5 @@
# https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding
{
'chromium_checkout': 'refs/tags/114.0.5735.0'
'chromium_checkout': 'refs/tags/115.0.5790.0'
}

16
include/capi/cef_x509_certificate_capi.h
View File

@ -33,7 +33,7 @@
// by hand. See the translator.README.txt file in the tools directory for
// more information.
//
// $hash=7a541729b4ac664b22cdea625f19f1dba1b6a685$
// $hash=a4b62b20f30552fef5d522bdd00ebf9a8f12464c$
//
#ifndef CEF_INCLUDE_CAPI_CEF_X509_CERTIFICATE_CAPI_H_
@ -93,13 +93,6 @@ typedef struct _cef_x509cert_principal_t {
cef_string_userfree_t(CEF_CALLBACK* get_country_name)(
struct _cef_x509cert_principal_t* self);
///
/// Retrieve the list of street addresses.
///
void(CEF_CALLBACK* get_street_addresses)(
struct _cef_x509cert_principal_t* self,
cef_string_list_t addresses);
///
/// Retrieve the list of organization names.
///
@ -113,13 +106,6 @@ typedef struct _cef_x509cert_principal_t {
void(CEF_CALLBACK* get_organization_unit_names)(
struct _cef_x509cert_principal_t* self,
cef_string_list_t names);
///
/// Retrieve the list of domain components.
///
void(CEF_CALLBACK* get_domain_components)(
struct _cef_x509cert_principal_t* self,
cef_string_list_t components);
} cef_x509cert_principal_t;
///

8
include/cef_api_hash.h
View File

@ -42,13 +42,13 @@
// way that may cause binary incompatibility with other builds. The universal
// hash value will change if any platform is affected whereas the platform hash
// values will change only if that particular platform is affected.
#define CEF_API_HASH_UNIVERSAL "61103000223ad380e5538c1c57862166d0882752"
#define CEF_API_HASH_UNIVERSAL "149b019ae2c24db658e962ab515feca360776a54"
#if defined(OS_WIN)
#define CEF_API_HASH_PLATFORM "f6cd8cea55b2198ff51b8a1e47239050f23b5a9e"
#define CEF_API_HASH_PLATFORM "9c04c5121117894863ea07e90353aded1f25d6f4"
#elif defined(OS_MAC)
#define CEF_API_HASH_PLATFORM "af3e1ed369344bc2d40b5d4da10e582309d14e06"
#define CEF_API_HASH_PLATFORM "d38c3f1db6bc8f11030bc49e437dd613ce33a47a"
#elif defined(OS_LINUX)
#define CEF_API_HASH_PLATFORM "58a17b28e55e61dee2f39a7a05a8cac49d37d031"
#define CEF_API_HASH_PLATFORM "ddf39847f37ef95324b8a11fefea4fb3c7c1e003"
#endif
#ifdef __cplusplus

12
include/cef_x509_certificate.h
View File

@ -81,12 +81,6 @@ class CefX509CertPrincipal : public virtual CefBaseRefCounted {
/*--cef()--*/
virtual CefString GetCountryName() = 0;
///
/// Retrieve the list of street addresses.
///
/*--cef()--*/
virtual void GetStreetAddresses(std::vector<CefString>& addresses) = 0;
///
/// Retrieve the list of organization names.
///
@ -98,12 +92,6 @@ class CefX509CertPrincipal : public virtual CefBaseRefCounted {
///
/*--cef()--*/
virtual void GetOrganizationUnitNames(std::vector<CefString>& names) = 0;
///
/// Retrieve the list of domain components.
///
/*--cef()--*/
virtual void GetDomainComponents(std::vector<CefString>& components) = 0;
};
///

3
include/internal/cef_types.h
View File

@ -3290,7 +3290,8 @@ typedef enum {
CEF_CPAIT_VIRTUAL_CARD_MANUAL_FALLBACK,
CEF_CPAIT_ZOOM,
CEF_CPAIT_SAVE_IBAN,
CEF_CPAIT_MAX_VALUE = CEF_CPAIT_SAVE_IBAN,
CEF_CPAIT_MANDATORY_REAUTH,
CEF_CPAIT_MAX_VALUE = CEF_CPAIT_MANDATORY_REAUTH,
} cef_chrome_page_action_icon_type_t;
///

1
include/internal/cef_types_content_settings.h
View File

@ -56,6 +56,7 @@ typedef enum {
CEF_CONTENT_SETTING_TYPE_MEDIASTREAM_MIC,
CEF_CONTENT_SETTING_TYPE_MEDIASTREAM_CAMERA,
CEF_CONTENT_SETTING_TYPE_PROTOCOL_HANDLERS,
CEF_CONTENT_SETTING_TYPE_DEPRECATED_PPAPI_BROKER,
CEF_CONTENT_SETTING_TYPE_AUTOMATIC_DOWNLOADS,
CEF_CONTENT_SETTING_TYPE_MIDI_SYSEX,
CEF_CONTENT_SETTING_TYPE_SSL_CERT_DECISIONS,

50
libcef/browser/alloy/alloy_content_browser_client.cc
View File

@ -506,35 +506,7 @@ void AlloyContentBrowserClient::SiteInstanceGotProcess(
}
extensions::ProcessMap::Get(context)->Insert(
extension->id(), site_instance->GetProcess()->GetID(),
site_instance->GetId());
}
void AlloyContentBrowserClient::SiteInstanceDeleting(
content::SiteInstance* site_instance) {
if (!extensions::ExtensionsEnabled()) {
return;
}
if (!site_instance->HasProcess()) {
return;
}
auto context = site_instance->GetBrowserContext();
auto registry = extensions::ExtensionRegistry::Get(context);
if (!registry) {
return;
}
auto extension = registry->enabled_extensions().GetExtensionOrAppByURL(
site_instance->GetSiteURL());
if (!extension) {
return;
}
extensions::ProcessMap::Get(context)->Remove(
extension->id(), site_instance->GetProcess()->GetID(),
site_instance->GetId());
extension->id(), site_instance->GetProcess()->GetID());
}
void AlloyContentBrowserClient::BindHostReceiverForRenderer(
@ -1176,9 +1148,9 @@ bool AlloyContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->cookieable_schemes =
cef_context->GetCookieableSchemes();
// TODO(cef): Remove this and add required NetworkIsolationKeys,
// TODO(cef): Remove this and add required NetworkAnonymizationKey,
// this is currently not the case and this was not required pre M84.
network_context_params->require_network_isolation_key = false;
network_context_params->require_network_anonymization_key = false;
return true;
}
@ -1318,7 +1290,7 @@ std::string AlloyContentBrowserClient::GetProduct() {
}
std::string AlloyContentBrowserClient::GetChromeProduct() {
return version_info::GetProductNameAndVersionForUserAgent();
return std::string(version_info::GetProductNameAndVersionForUserAgent());
}
std::string AlloyContentBrowserClient::GetUserAgent() {
@ -1340,18 +1312,8 @@ AlloyContentBrowserClient::GetWebContentsViewDelegate(
}
blink::UserAgentMetadata AlloyContentBrowserClient::GetUserAgentMetadata() {
blink::UserAgentMetadata metadata;
metadata.brand_version_list = {blink::UserAgentBrandVersion{
version_info::GetProductName(), version_info::GetMajorVersionNumber()}};
metadata.full_version = version_info::GetVersionNumber();
metadata.platform = version_info::GetOSType();
// TODO(mkwst): Poke at BuildUserAgentFromProduct to split out these pieces.
metadata.architecture = "";
metadata.model = "";
return metadata;
return embedder_support::GetUserAgentMetadata(
g_browser_process->local_state());
}
base::flat_set<std::string>

1
libcef/browser/alloy/alloy_content_browser_client.h
View File

@ -65,7 +65,6 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
bool IsWebUIAllowedToMakeNetworkRequests(const url::Origin& origin) override;
bool IsHandledURL(const GURL& url) override;
void SiteInstanceGotProcess(content::SiteInstance* site_instance) override;
void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
void BindHostReceiverForRenderer(
content::RenderProcessHost* render_process_host,
mojo::GenericPendingReceiver receiver) override;

6
libcef/browser/alloy/chrome_browser_process_alloy.cc
View File

@ -172,6 +172,12 @@ ChromeBrowserProcessAlloy::network_quality_tracker() {
return nullptr;
}
embedder_support::OriginTrialsSettingsStorage*
ChromeBrowserProcessAlloy::GetOriginTrialsSettingsStorage() {
DCHECK(false);
return nullptr;
}
ProfileManager* ChromeBrowserProcessAlloy::profile_manager() {
DCHECK(context_initialized_);
return profile_manager_.get();

2
libcef/browser/alloy/chrome_browser_process_alloy.h
View File

@ -57,6 +57,8 @@ class ChromeBrowserProcessAlloy : public BrowserProcess {
metrics::MetricsService* metrics_service() override;
SystemNetworkContextManager* system_network_context_manager() override;
network::NetworkQualityTracker* network_quality_tracker() override;
embedder_support::OriginTrialsSettingsStorage*
GetOriginTrialsSettingsStorage() override;
ProfileManager* profile_manager() override;
PrefService* local_state() override;
scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory()

4
libcef/browser/browser_host_base.cc
View File

@ -28,6 +28,7 @@
#include "content/public/browser/download_request_utils.h"
#include "content/public/browser/file_select_listener.h"
#include "content/public/browser/navigation_entry.h"
#include "ui/base/resource/resource_scale_factor.h"
#include "ui/gfx/image/image_skia.h"
#include "ui/shell_dialogs/select_file_policy.h"
@ -340,9 +341,10 @@ void CefBrowserHostBase::DownloadImage(
return;
}
const float scale = ui::GetScaleForMaxSupportedResourceScaleFactor();
web_contents->DownloadImage(
gurl, is_favicon, gfx::Size(max_image_size, max_image_size),
max_image_size * gfx::ImageSkia::GetMaxSupportedScale(), bypass_cache,
max_image_size * scale, bypass_cache,
base::BindOnce(
[](uint32 max_image_size,
CefRefPtr<CefDownloadImageCallback> callback, int id,

2
libcef/browser/extensions/extension_system.cc
View File

@ -473,7 +473,7 @@ void CefExtensionSystem::InstallUpdate(
void CefExtensionSystem::PerformActionBasedOnOmahaAttributes(
const std::string& extension_id,
const base::Value& attributes) {
const base::Value::Dict& attributes) {
DCHECK(false);
}

2
libcef/browser/extensions/extension_system.h
View File

@ -108,7 +108,7 @@ class CefExtensionSystem : public ExtensionSystem {
InstallUpdateCallback install_update_callback) override;
void PerformActionBasedOnOmahaAttributes(
const std::string& extension_id,
const base::Value& attributes) override;
const base::Value::Dict& attributes) override;
bool FinishDelayedInstallationIfReady(const std::string& extension_id,
bool install_immediately) override;

10
libcef/browser/osr/touch_selection_controller_client_osr.cc
View File

@ -171,6 +171,16 @@ void CefTouchSelectionControllerClientOSR::DidStopFlinging() {
OnScrollCompleted();
}
void CefTouchSelectionControllerClientOSR::OnSwipeToMoveCursorBegin() {
rwhv_->selection_controller()->OnSwipeToMoveCursorBegin();
OnSelectionEvent(ui::INSERTION_HANDLE_DRAG_STARTED);
}
void CefTouchSelectionControllerClientOSR::OnSwipeToMoveCursorEnd() {
rwhv_->selection_controller()->OnSwipeToMoveCursorEnd();
OnSelectionEvent(ui::INSERTION_HANDLE_DRAG_STOPPED);
}
void CefTouchSelectionControllerClientOSR::UpdateClientSelectionBounds(
const gfx::SelectionBound& start,
const gfx::SelectionBound& end) {

2
libcef/browser/osr/touch_selection_controller_client_osr.h
View File

@ -70,6 +70,8 @@ class CefTouchSelectionControllerClientOSR
// TouchSelectionControllerClientManager.
void DidStopFlinging() override;
void OnSwipeToMoveCursorBegin() override;
void OnSwipeToMoveCursorEnd() override;
void UpdateClientSelectionBounds(
const gfx::SelectionBound& start,
const gfx::SelectionBound& end,

2
libcef/browser/prefs/browser_prefs.cc
View File

@ -62,6 +62,7 @@
#include "components/spellcheck/browser/pref_names.h"
#include "components/sync_preferences/pref_service_syncable.h"
#include "components/sync_preferences/pref_service_syncable_factory.h"
#include "components/unified_consent/unified_consent_service.h"
#include "components/update_client/update_client.h"
#include "content/public/browser/browser_thread.h"
#include "extensions/browser/extension_prefs.h"
@ -277,6 +278,7 @@ std::unique_ptr<PrefService> CreatePrefService(Profile* profile,
privacy_sandbox::RegisterProfilePrefs(registry.get());
ProfileNetworkContextService::RegisterProfilePrefs(registry.get());
safe_browsing::RegisterProfilePrefs(registry.get());
unified_consent::UnifiedConsentService::RegisterPrefs(registry.get());
const std::string& locale =
command_line->GetSwitchValueASCII(switches::kLang);

4
libcef/browser/prefs/pref_registrar.cc
View File

@ -70,9 +70,9 @@ class CefPreferenceRegistrarImpl : public CefPreferenceRegistrar {
auto impl_value = impl->CopyValue();
if (impl_value.type() == base::Value::Type::DICT) {
registry_->RegisterDictionaryPref(name, std::move(impl_value));
registry_->RegisterDictionaryPref(name, std::move(impl_value.GetDict()));
} else if (impl_value.type() == base::Value::Type::LIST) {
registry_->RegisterListPref(name, std::move(impl_value));
registry_->RegisterListPref(name, std::move(impl_value.GetList()));
} else {
DCHECK(false);
}

4
libcef/browser/printing/print_util.cc
View File

@ -53,9 +53,7 @@ void OnPDFCreated(const CefString& path,
void Print(content::WebContents* web_contents, bool print_preview_disabled) {
// Like chrome::Print() but specifying the WebContents.
printing::StartPrint(web_contents,
/*print_renderer=*/mojo::NullAssociatedRemote(),
print_preview_disabled,
printing::StartPrint(web_contents, print_preview_disabled,
/*has_selection=*/false);
}

15
libcef/browser/ssl_host_state_delegate.cc
View File

@ -69,6 +69,21 @@ bool CefSSLHostStateDelegate::IsHttpAllowedForHost(
return false;
}
void CefSSLHostStateDelegate::SetHttpsEnforcementForHost(
const std::string& host,
bool enforce,
content::StoragePartition* storage_partition) {
// Intentional no-op.
}
bool CefSSLHostStateDelegate::IsHttpsEnforcedForHost(
const std::string& host,
content::StoragePartition* storage_partition) {
// Intentional no-op. Return value does not matter as HTTPS-First Mode is not
// enabled.
return false;
}
void CefSSLHostStateDelegate::AllowCert(
const std::string& host,
const net::X509Certificate& cert,

7
libcef/browser/ssl_host_state_delegate.h
View File

@ -73,6 +73,13 @@ class CefSSLHostStateDelegate : public content::SSLHostStateDelegate {
bool IsHttpAllowedForHost(
const std::string& host,
content::StoragePartition* storage_partition) override;
void SetHttpsEnforcementForHost(
const std::string& host,
bool enforce,
content::StoragePartition* storage_partition) override;
bool IsHttpsEnforcedForHost(
const std::string& host,
content::StoragePartition* storage_partition) override;
void RevokeUserAllowExceptions(const std::string& host) override;
bool HasAllowException(const std::string& host,
content::StoragePartition* storage_partition) override;

12
libcef/browser/views/window_impl.cc
View File

@ -20,12 +20,11 @@
#include "ui/views/controls/menu/menu_runner.h"
#if defined(USE_AURA)
#include "ui/aura/test/ui_controls_factory_aura.h"
#include "ui/aura/window.h"
#include "ui/base/test/ui_controls_aura.h"
#endif // defined(USE_AURA)
#if BUILDFLAG(IS_WIN)
#include "ui/aura/test/ui_controls_aurawin.h"
#include "ui/display/win/screen_win.h"
#endif
@ -35,16 +34,11 @@ namespace {
void InitializeUITesting() {
static bool initialized = false;
if (!initialized) {
ui_controls::EnableUIControls();
#if defined(USE_AURA)
#if BUILDFLAG(IS_WIN)
ui_controls::InstallUIControlsAura(
aura::test::CreateUIControlsAura(nullptr));
#elif BUILDFLAG(IS_OZONE)
aura::test::EnableUIControlsAuraWin();
#else
ui_controls::EnableUIControls();
#endif
#endif // defined(USE_AURA)
initialized = true;
}

10
libcef/browser/x509_cert_principal_impl.cc
View File

@ -46,11 +46,6 @@ CefString CefX509CertPrincipalImpl::GetCountryName() {
return value_.country_name;
}
void CefX509CertPrincipalImpl::GetStreetAddresses(
std::vector<CefString>& addresses) {
TransferVector(value_.street_addresses, addresses);
}
void CefX509CertPrincipalImpl::GetOrganizationNames(
std::vector<CefString>& names) {
TransferVector(value_.organization_names, names);
@ -60,8 +55,3 @@ void CefX509CertPrincipalImpl::GetOrganizationUnitNames(
std::vector<CefString>& names) {
TransferVector(value_.organization_unit_names, names);
}
void CefX509CertPrincipalImpl::GetDomainComponents(
std::vector<CefString>& components) {
TransferVector(value_.domain_components, components);
}

2
libcef/browser/x509_cert_principal_impl.h
View File

@ -24,10 +24,8 @@ class CefX509CertPrincipalImpl : public CefX509CertPrincipal {
CefString GetLocalityName() override;
CefString GetStateOrProvinceName() override;
CefString GetCountryName() override;
void GetStreetAddresses(std::vector<CefString>& addresses) override;
void GetOrganizationNames(std::vector<CefString>& names) override;
void GetOrganizationUnitNames(std::vector<CefString>& names) override;
void GetDomainComponents(std::vector<CefString>& components) override;
private:
net::CertPrincipal value_;

8
libcef/common/util_mac.mm
View File

@ -6,10 +6,10 @@
#include "libcef/common/cef_switches.h"
#include "base/apple/bundle_locations.h"
#include "base/base_paths.h"
#include "base/command_line.h"
#include "base/logging.h"
#include "base/mac/bundle_locations.h"
#include "base/mac/foundation_util.h"
#include "base/path_service.h"
#include "base/strings/sys_string_conversions.h"
@ -35,14 +35,14 @@ void OverrideFrameworkBundlePath() {
base::FilePath framework_path = GetFrameworkDirectory();
DCHECK(!framework_path.empty());
base::mac::SetOverrideFrameworkBundlePath(framework_path);
base::apple::SetOverrideFrameworkBundlePath(framework_path);
}
void OverrideOuterBundlePath() {
base::FilePath bundle_path = GetMainBundlePath();
DCHECK(!bundle_path.empty());
base::mac::SetOverrideOuterBundlePath(bundle_path);
base::apple::SetOverrideOuterBundlePath(bundle_path);
}
void OverrideBaseBundleID() {
@ -134,7 +134,7 @@ base::FilePath GetMainBundlePath() {
}
std::string GetMainBundleID() {
NSBundle* bundle = base::mac::OuterBundle();
NSBundle* bundle = base::apple::OuterBundle();
return base::SysNSStringToUTF8([bundle bundleIdentifier]);
}

62
libcef_dll/cpptoc/x509cert_principal_cpptoc.cc
View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=00565554ad76306eea416264a355273d72af7820$
// $hash=74394106da192b6b9fc284bbf8899ae3d5ea0b8d$
//
#include "libcef_dll/cpptoc/x509cert_principal_cpptoc.h"
@ -112,35 +112,6 @@ x509cert_principal_get_country_name(struct _cef_x509cert_principal_t* self) {
return _retval.DetachToUserFree();
}
void CEF_CALLBACK
x509cert_principal_get_street_addresses(struct _cef_x509cert_principal_t* self,
cef_string_list_t addresses) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return;
}
// Verify param: addresses; type: string_vec_byref
DCHECK(addresses);
if (!addresses) {
return;
}
// Translate param: addresses; type: string_vec_byref
std::vector<CefString> addressesList;
transfer_string_list_contents(addresses, addressesList);
// Execute
CefX509CertPrincipalCppToC::Get(self)->GetStreetAddresses(addressesList);
// Restore param: addresses; type: string_vec_byref
cef_string_list_clear(addresses);
transfer_string_list_contents(addressesList, addresses);
}
void CEF_CALLBACK x509cert_principal_get_organization_names(
struct _cef_x509cert_principal_t* self,
cef_string_list_t names) {
@ -199,35 +170,6 @@ void CEF_CALLBACK x509cert_principal_get_organization_unit_names(
transfer_string_list_contents(namesList, names);
}
void CEF_CALLBACK
x509cert_principal_get_domain_components(struct _cef_x509cert_principal_t* self,
cef_string_list_t components) {
shutdown_checker::AssertNotShutdown();
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
DCHECK(self);
if (!self) {
return;
}
// Verify param: components; type: string_vec_byref
DCHECK(components);
if (!components) {
return;
}
// Translate param: components; type: string_vec_byref
std::vector<CefString> componentsList;
transfer_string_list_contents(components, componentsList);
// Execute
CefX509CertPrincipalCppToC::Get(self)->GetDomainComponents(componentsList);
// Restore param: components; type: string_vec_byref
cef_string_list_clear(components);
transfer_string_list_contents(componentsList, components);
}
} // namespace
// CONSTRUCTOR - Do not edit by hand.
@ -239,12 +181,10 @@ CefX509CertPrincipalCppToC::CefX509CertPrincipalCppToC() {
GetStruct()->get_state_or_province_name =
x509cert_principal_get_state_or_province_name;
GetStruct()->get_country_name = x509cert_principal_get_country_name;
GetStruct()->get_street_addresses = x509cert_principal_get_street_addresses;
GetStruct()->get_organization_names =
x509cert_principal_get_organization_names;
GetStruct()->get_organization_unit_names =
x509cert_principal_get_organization_unit_names;
GetStruct()->get_domain_components = x509cert_principal_get_domain_components;
}
// DESTRUCTOR - Do not edit by hand.

62
libcef_dll/ctocpp/x509cert_principal_ctocpp.cc
View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=c577948bc4903eac504888829a610d149757fcc4$
// $hash=5a5997b69936ad47fb9ab5b6f4016f33c91110c7$
//
#include "libcef_dll/ctocpp/x509cert_principal_ctocpp.h"
@ -117,36 +117,6 @@ CefString CefX509CertPrincipalCToCpp::GetCountryName() {
return _retvalStr;
}
NO_SANITIZE("cfi-icall")
void CefX509CertPrincipalCToCpp::GetStreetAddresses(
std::vector<CefString>& addresses) {
shutdown_checker::AssertNotShutdown();
cef_x509cert_principal_t* _struct = GetStruct();
if (CEF_MEMBER_MISSING(_struct, get_street_addresses)) {
return;
}
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Translate param: addresses; type: string_vec_byref
cef_string_list_t addressesList = cef_string_list_alloc();
DCHECK(addressesList);
if (addressesList) {
transfer_string_list_contents(addresses, addressesList);
}
// Execute
_struct->get_street_addresses(_struct, addressesList);
// Restore param:addresses; type: string_vec_byref
if (addressesList) {
addresses.clear();
transfer_string_list_contents(addressesList, addresses);
cef_string_list_free(addressesList);
}
}
NO_SANITIZE("cfi-icall")
void CefX509CertPrincipalCToCpp::GetOrganizationNames(
std::vector<CefString>& names) {
@ -207,36 +177,6 @@ void CefX509CertPrincipalCToCpp::GetOrganizationUnitNames(
}
}
NO_SANITIZE("cfi-icall")
void CefX509CertPrincipalCToCpp::GetDomainComponents(
std::vector<CefString>& components) {
shutdown_checker::AssertNotShutdown();
cef_x509cert_principal_t* _struct = GetStruct();
if (CEF_MEMBER_MISSING(_struct, get_domain_components)) {
return;
}
// AUTO-GENERATED CONTENT - DELETE THIS COMMENT BEFORE MODIFYING
// Translate param: components; type: string_vec_byref
cef_string_list_t componentsList = cef_string_list_alloc();
DCHECK(componentsList);
if (componentsList) {
transfer_string_list_contents(components, componentsList);
}
// Execute
_struct->get_domain_components(_struct, componentsList);
// Restore param:components; type: string_vec_byref
if (componentsList) {
components.clear();
transfer_string_list_contents(componentsList, components);
cef_string_list_free(componentsList);
}
}
// CONSTRUCTOR - Do not edit by hand.
CefX509CertPrincipalCToCpp::CefX509CertPrincipalCToCpp() {}

4
libcef_dll/ctocpp/x509cert_principal_ctocpp.h
View File

@ -9,7 +9,7 @@
// implementations. See the translator.README.txt file in the tools directory
// for more information.
//
// $hash=26c06425ee3d75470177631cff1348e5dc26f946$
// $hash=8baec3ed7625e735ebfb911bd92dacecbebe9cb4$
//
#ifndef CEF_LIBCEF_DLL_CTOCPP_X509CERT_PRINCIPAL_CTOCPP_H_
@ -41,10 +41,8 @@ class CefX509CertPrincipalCToCpp
CefString GetLocalityName() override;
CefString GetStateOrProvinceName() override;
CefString GetCountryName() override;
void GetStreetAddresses(std::vector<CefString>& addresses) override;
void GetOrganizationNames(std::vector<CefString>& names) override;
void GetOrganizationUnitNames(std::vector<CefString>& names) override;
void GetDomainComponents(std::vector<CefString>& components) override;
};
#endif // CEF_LIBCEF_DLL_CTOCPP_X509CERT_PRINCIPAL_CTOCPP_H_

15
patch/patch.cfg
View File

@ -188,9 +188,6 @@ patches = [
},
{
# Support CEF changes in chrome/browser.
#
# Fix duplicate symbols for enterprise_connectors::ContentAnalysisSdkManager
# https://bugs.chromium.org/p/chromium/issues/detail?id=1368633
'name': 'chrome_browser',
},
{
@ -277,8 +274,11 @@ patches = [
{
# Make some methods of ProfileManager virtual.
#
# Don't create IdentityManager in RendererUpdater.
# alloy: Don't create IdentityManager or BoundSessionCookieRefreshService in
# RendererUpdater. This avoids adding a dependency on
# AccountConsistencyModeManager which itself depends on browser signin.
# https://github.com/chromiumembedded/cef/issues/1917
# https://github.com/chromiumembedded/cef/issues/3401
#
# chrome: Support CEF incognito Profiles that allow Browser creation.
# chrome: Allow CEF to delay OffTheRecordProfileImpl initialization.
@ -577,6 +577,13 @@ patches = [
# https://github.com/chromiumembedded/cef/issues/3210
'name': 'win_sandbox_3210',
},
{
# Windows: Fix MSVC compile error with sandbox target.
# error: static assertion failed due to requirement
# '!is_const_v<const unsigned char>': The C++ Standard forbids
# containers of const elements because allocator<const T> is ill-formed.
'name': 'win_sandbox_policy',
},
{
# Windows: Always use the root window as the owner for shell dialogs.
# https://github.com/chromiumembedded/cef/issues/3294

6
patch/patches/base_sandbox_2743.patch
View File

@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn
index 425cb0ab0af16..57cda56dcfc19 100644
index 4925a756be531..dbd2464d4cf9b 100644
--- base/BUILD.gn
+++ base/BUILD.gn
@@ -40,6 +40,7 @@ import("//build/config/ui.gni")
@ -10,7 +10,7 @@ index 425cb0ab0af16..57cda56dcfc19 100644
import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
@@ -1528,7 +1529,11 @@ component("base") {
@@ -1529,7 +1530,11 @@ component("base") {
"hash/md5_constexpr_internal.h",
"hash/sha1.h",
]
@ -88,7 +88,7 @@ index 29626e5853c6e..2fb1c61504c5d 100644
#else
#include "base/hash/sha1_boringssl.h"
diff --git base/rand_util.h base/rand_util.h
index 38be94387237d..889550e16a6ce 100644
index c9dd1249660c1..7d68b0d893e3d 100644
--- base/rand_util.h
+++ base/rand_util.h
@@ -15,8 +15,9 @@

36
patch/patches/base_test_4396276.patch
View File

@ -1,16 +1,20 @@
diff --git base/test/BUILD.gn base/test/BUILD.gn
index cc75b7235f438..f5bbc354f7918 100644
index a0df3473186a6..02c859e2eca78 100644
--- base/test/BUILD.gn
+++ base/test/BUILD.gn
@@ -175,7 +175,6 @@ static_library("test_support") {
@@ -177,11 +177,6 @@ static_library("test_support") {
if (!is_chromeos) {
# TODO(rasikan): Add to ios and chromeos when unblocked by the chromiumos
# change to add the shared lib to the chrome-binary-tests directory.
- public_deps += [ ":test_trace_processor" ]
- sources += [
- "test_trace_processor.cc",
- "test_trace_processor.h",
- ]
if (is_ios) {
deps += [
":test_trace_processor+bundle",
@@ -490,7 +489,7 @@ if (enable_base_tracing) {
@@ -496,7 +491,7 @@ if (enable_base_tracing) {
# processor depends on dev_sqlite. The two share the same symbols but have
# different implementations, so we need to hide dev_sqlite in this shared
# library even in non-component builds to prevent duplicate symbols.
@ -19,7 +23,16 @@ index cc75b7235f438..f5bbc354f7918 100644
if (is_ios) {
_target_type = "ios_framework_bundle"
}
@@ -516,32 +515,5 @@ if (enable_base_tracing) {
@@ -505,6 +500,8 @@ if (enable_base_tracing) {
defines = [ "TEST_TRACE_PROCESSOR_IMPL" ]
testonly = true
sources = [
+ "test_trace_processor.cc",
+ "test_trace_processor.h",
"test_trace_processor_export.h",
"test_trace_processor_impl.cc",
"test_trace_processor_impl.h",
@@ -522,33 +519,6 @@ if (enable_base_tracing) {
output_name = "TestTraceProcessor"
bundle_deps_filter = [ "//third_party/icu:icudata" ]
}
@ -51,7 +64,8 @@ index cc75b7235f438..f5bbc354f7918 100644
- public_deps = [ ":test_trace_processor" ]
- }
}
}
} else if (!is_component_build && is_mac) {
# Provide a dummy target in order for clients to not have to special-case
diff --git base/test/test_trace_processor_export.h base/test/test_trace_processor_export.h
index f5191b804bc07..aadb7d66ba4c3 100644
--- base/test/test_trace_processor_export.h
@ -74,10 +88,10 @@ index f5191b804bc07..aadb7d66ba4c3 100644
+
#endif // BASE_TEST_TEST_TRACE_PROCESSOR_EXPORT_H_
diff --git content/shell/BUILD.gn content/shell/BUILD.gn
index e0921c6326700..1d3fbfaa532a1 100644
index 1e96da71a8437..2e1b48a4aa9c9 100644
--- content/shell/BUILD.gn
+++ content/shell/BUILD.gn
@@ -809,7 +809,6 @@ if (is_mac) {
@@ -831,7 +831,6 @@ if (is_mac) {
# Specify a sensible install_name for static builds. The library is
# dlopen()ed so this is not used to resolve the module.
ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$output_name.framework/$output_name" ]
@ -86,10 +100,10 @@ index e0921c6326700..1d3fbfaa532a1 100644
# Both the main :content_shell and :content_shell_helper_app executables
# need to link the framework. Because they are at different directory
diff --git gpu/BUILD.gn gpu/BUILD.gn
index 7bbd7cb6be9c2..df9e0f2a93ad9 100644
index 5496a01184497..84a2fe181089f 100644
--- gpu/BUILD.gn
+++ gpu/BUILD.gn
@@ -730,10 +730,7 @@ test("gpu_unittests") {
@@ -735,10 +735,7 @@ test("gpu_unittests") {
"//url",
]
@ -99,5 +113,5 @@ index 7bbd7cb6be9c2..df9e0f2a93ad9 100644
- if (enable_base_tracing && !is_cronet_build && is_chromeos) {
+ if (enable_base_tracing) {
deps += [ "//base/test:test_trace_processor" ]
}
sources += [
"//base/test/test_trace_processor.cc",

4
patch/patches/blink_web_element_4200240.patch
View File

@ -13,10 +13,10 @@ index a23dd0a402704..91e4d3615fb6a 100644
// Returns all <label> elements associated to this element.
WebVector<WebLabelElement> Labels() const;
diff --git third_party/blink/renderer/core/exported/web_element.cc third_party/blink/renderer/core/exported/web_element.cc
index 31c5027c972a7..ae418a4c1d004 100644
index a2afa376065be..be829f7f58854 100644
--- third_party/blink/renderer/core/exported/web_element.cc
+++ third_party/blink/renderer/core/exported/web_element.cc
@@ -106,6 +106,24 @@ void WebElement::SetAttribute(const WebString& attr_name,
@@ -105,6 +105,24 @@ void WebElement::SetAttribute(const WebString& attr_name,
IGNORE_EXCEPTION_FOR_TESTING);
}

4
patch/patches/browser_scheduler.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/scheduler/browser_task_executor.cc content/browser/scheduler/browser_task_executor.cc
index 818e5f14ee60f..d68d6a16cda67 100644
index 69f9daf8388e9..6f1bc7c9ab40b 100644
--- content/browser/scheduler/browser_task_executor.cc
+++ content/browser/scheduler/browser_task_executor.cc
@@ -221,7 +221,7 @@ BrowserTaskExecutor::OnUserInputStart() {
@@ -201,7 +201,7 @@ BrowserTaskExecutor::OnUserInputStart() {
// static
void BrowserTaskExecutor::Shutdown() {

10
patch/patches/browser_security_policy_1081397.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
index 66008c3abbc49..64d2773724750 100644
index 38f318f9c0b45..0c8c86efedd07 100644
--- content/browser/child_process_security_policy_impl.cc
+++ content/browser/child_process_security_policy_impl.cc
@@ -1804,6 +1804,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin(
@@ -1815,6 +1815,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin(
// DeclarativeApiTest.PersistRules.
if (actual_process_lock.matches_scheme(url::kDataScheme))
return true;
@ -20,10 +20,10 @@ index 66008c3abbc49..64d2773724750 100644
// Make an exception to allow most visited tiles to commit in
diff --git content/browser/renderer_host/navigation_request.cc content/browser/renderer_host/navigation_request.cc
index 1bb280cc5c81d..e06315f1d0628 100644
index ad258abf7e17f..4d94f7144f5ce 100644
--- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc
@@ -7321,10 +7321,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
@@ -7446,10 +7446,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
bool use_opaque_origin =
(sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
network::mojom::WebSandboxFlags::kOrigin;
@ -47,7 +47,7 @@ index 1bb280cc5c81d..e06315f1d0628 100644
}
return origin_and_debug_info;
@@ -7354,6 +7366,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
@@ -7479,6 +7491,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
SandboxFlagsToCommit());

4
patch/patches/build.patch
View File

@ -1,8 +1,8 @@
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
index 53db095c1b1ef..de2e7de4bf231 100644
index 23a8da453c3d2..66ad9b2ab0ed6 100644
--- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn
@@ -1929,8 +1929,6 @@ config("thin_archive") {
@@ -2015,8 +2015,6 @@ config("thin_archive") {
# confuses lldb.
if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
arflags = [ "-T" ]

15
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index 6780e7770a9fe..0eaf2593ce127 100644
index 77d5dfbe1d547..29d9252d29739 100644
--- chrome/browser/BUILD.gn
+++ chrome/browser/BUILD.gn
@@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni")
@ -10,7 +10,7 @@ index 6780e7770a9fe..0eaf2593ce127 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1935,6 +1936,7 @@ static_library("browser") {
@@ -1957,6 +1958,7 @@ static_library("browser") {
"//build/config/chromebox_for_meetings:buildflags",
"//build/config/compiler:compiler_buildflags",
"//cc",
@ -18,7 +18,7 @@ index 6780e7770a9fe..0eaf2593ce127 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2522,6 +2524,10 @@ static_library("browser") {
@@ -2547,6 +2549,10 @@ static_library("browser") {
]
}
@ -29,12 +29,3 @@ index 6780e7770a9fe..0eaf2593ce127 100644
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
@@ -6114,8 +6120,6 @@ static_library("browser") {
sources += [
"enterprise/chrome_browser_main_extra_parts_enterprise.cc",
"enterprise/chrome_browser_main_extra_parts_enterprise.h",
- "enterprise/connectors/analysis/content_analysis_sdk_manager.cc",
- "enterprise/connectors/analysis/content_analysis_sdk_manager.h",
"enterprise/connectors/analysis/local_binary_upload_service.cc",
"enterprise/connectors/analysis/local_binary_upload_service.h",
"enterprise/connectors/analysis/local_binary_upload_service_factory.cc",

16
patch/patches/chrome_browser_background_mode_1100085.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/browser_process.h chrome/browser/browser_process.h
index 4279a763e28e2..2ec8e4cbfac7d 100644
index 6dc8016311847..851f866e388f5 100644
--- chrome/browser/browser_process.h
+++ chrome/browser/browser_process.h
@@ -206,9 +206,9 @@ class BrowserProcess {
@@ -214,9 +214,9 @@ class BrowserProcess {
virtual DownloadStatusUpdater* download_status_updater() = 0;
virtual DownloadRequestLimiter* download_request_limiter() = 0;
@ -14,10 +14,10 @@ index 4279a763e28e2..2ec8e4cbfac7d 100644
std::unique_ptr<BackgroundModeManager> manager) = 0;
#endif
diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
index 787a23b85d06c..80a8667e58a86 100644
index ff0bfdce017a5..0971782184774 100644
--- chrome/browser/browser_process_impl.cc
+++ chrome/browser/browser_process_impl.cc
@@ -1042,18 +1042,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
@@ -1054,18 +1054,14 @@ DownloadRequestLimiter* BrowserProcessImpl::download_request_limiter() {
return download_request_limiter_.get();
}
@ -38,10 +38,10 @@ index 787a23b85d06c..80a8667e58a86 100644
std::unique_ptr<BackgroundModeManager> manager) {
background_mode_manager_ = std::move(manager);
diff --git chrome/browser/browser_process_impl.h chrome/browser/browser_process_impl.h
index 35ab0ab1cc102..74252dc2b53aa 100644
index 0f98eece3c159..a261c43634870 100644
--- chrome/browser/browser_process_impl.h
+++ chrome/browser/browser_process_impl.h
@@ -176,8 +176,8 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -187,8 +187,8 @@ class BrowserProcessImpl : public BrowserProcess,
void SetApplicationLocale(const std::string& actual_locale) override;
DownloadStatusUpdater* download_status_updater() override;
DownloadRequestLimiter* download_request_limiter() override;
@ -52,10 +52,10 @@ index 35ab0ab1cc102..74252dc2b53aa 100644
std::unique_ptr<BackgroundModeManager> manager) override;
#endif
diff --git chrome/browser/lifetime/browser_close_manager.cc chrome/browser/lifetime/browser_close_manager.cc
index ac79a59ef056b..cac2b4d97271c 100644
index 1fbc225de7b84..55847e48ed0c2 100644
--- chrome/browser/lifetime/browser_close_manager.cc
+++ chrome/browser/lifetime/browser_close_manager.cc
@@ -158,12 +158,14 @@ void BrowserCloseManager::CloseBrowsers() {
@@ -157,12 +157,14 @@ void BrowserCloseManager::CloseBrowsers() {
// exit can restore all browsers open before exiting.
ProfileManager::ShutdownSessionServices();
#endif

46
patch/patches/chrome_browser_browser.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/browser_about_handler.cc chrome/browser/browser_about_handler.cc
index 370d6ab102471..fe1e4111780ed 100644
index 2480282a19d12..dbd1fbf8a15b5 100644
--- chrome/browser/browser_about_handler.cc
+++ chrome/browser/browser_about_handler.cc
@@ -69,6 +69,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
@@ -72,6 +72,9 @@ bool HandleNonNavigationAboutURL(const GURL& url) {
FROM_HERE, base::BindOnce(&chrome::AttemptExit));
return true;
}
@ -13,7 +13,7 @@ index 370d6ab102471..fe1e4111780ed 100644
return false;
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index da6c3853d1540..273915b67a396 100644
index 9e536d6f48970..aeb659d55123c 100644
--- chrome/browser/ui/BUILD.gn
+++ chrome/browser/ui/BUILD.gn
@@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni")
@ -24,7 +24,7 @@ index da6c3853d1540..273915b67a396 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/ash/components/assistant/assistant.gni")
@@ -368,6 +369,10 @@ static_library("ui") {
@@ -466,6 +467,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@ -35,7 +35,7 @@ index da6c3853d1540..273915b67a396 100644
# Since browser and browser_ui actually depend on each other,
# we must omit the dependency from browser_ui to browser.
# However, this means browser_ui and browser should more or less
@@ -392,6 +397,7 @@ static_library("ui") {
@@ -490,6 +495,7 @@ static_library("ui") {
"//build:chromeos_buildflags",
"//build/config/chromebox_for_meetings:buildflags",
"//cc/paint",
@ -43,7 +43,7 @@ index da6c3853d1540..273915b67a396 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2600,6 +2606,8 @@ static_library("ui") {
@@ -2706,6 +2712,8 @@ static_library("ui") {
"views/apps/app_dialog/app_block_dialog_view.h",
"views/apps/app_dialog/app_pause_dialog_view.cc",
"views/apps/app_dialog/app_pause_dialog_view.h",
@ -52,7 +52,7 @@ index da6c3853d1540..273915b67a396 100644
"views/apps/app_info_dialog/arc_app_info_links_panel.cc",
"views/apps/app_info_dialog/arc_app_info_links_panel.h",
"views/apps/chrome_app_window_client_views_chromeos.cc",
@@ -4429,8 +4437,6 @@ static_library("ui") {
@@ -4499,8 +4507,6 @@ static_library("ui") {
"views/accessibility/theme_tracking_non_accessible_image_view.h",
"views/apps/app_dialog/app_dialog_view.cc",
"views/apps/app_dialog/app_dialog_view.h",
@ -61,7 +61,7 @@ index da6c3853d1540..273915b67a396 100644
"views/apps/app_info_dialog/app_info_dialog_container.cc",
"views/apps/app_info_dialog/app_info_dialog_container.h",
"views/apps/app_info_dialog/app_info_dialog_views.cc",
@@ -5990,6 +5996,7 @@ static_library("ui") {
@@ -6082,6 +6088,7 @@ static_library("ui") {
if (enable_printing) {
deps += [
"//components/printing/browser",
@ -70,7 +70,7 @@ index da6c3853d1540..273915b67a396 100644
]
}
diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc
index 0fcb0295dec5d..134b0b2ccc61c 100644
index 71297e151bb62..8c642d031f3c1 100644
--- chrome/browser/ui/browser.cc
+++ chrome/browser/ui/browser.cc
@@ -264,6 +264,25 @@
@ -126,7 +126,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
}
///////////////////////////////////////////////////////////////////////////////
@@ -1380,6 +1412,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
@@ -1379,6 +1411,14 @@ content::KeyboardEventProcessingResult Browser::PreHandleKeyboardEvent(
if (exclusive_access_manager_->HandleUserKeyEvent(event))
return content::KeyboardEventProcessingResult::HANDLED;
@ -141,7 +141,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
return window()->PreHandleKeyboardEvent(event);
}
@@ -1387,8 +1427,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
@@ -1386,8 +1426,18 @@ bool Browser::HandleKeyboardEvent(content::WebContents* source,
const NativeWebKeyboardEvent& event) {
DevToolsWindow* devtools_window =
DevToolsWindow::GetInstanceForInspectedWebContents(source);
@ -162,7 +162,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
}
bool Browser::TabsNeedBeforeUnloadFired() {
@@ -1591,6 +1641,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
@@ -1590,6 +1640,14 @@ WebContents* Browser::OpenURLFromTab(WebContents* source,
return window->OpenURLFromTab(source, params);
}
@ -177,7 +177,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
NavigateParams nav_params(this, params.url, params.transition);
nav_params.FillNavigateParamsFromOpenURLParams(params);
nav_params.source_contents = source;
@@ -1748,6 +1806,8 @@ void Browser::LoadingStateChanged(WebContents* source,
@@ -1747,6 +1805,8 @@ void Browser::LoadingStateChanged(WebContents* source,
bool should_show_loading_ui) {
ScheduleUIUpdate(source, content::INVALIDATE_TYPE_LOAD);
UpdateWindowForLoadingStateChanged(source, should_show_loading_ui);
@ -186,7 +186,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
}
void Browser::CloseContents(WebContents* source) {
@@ -1776,6 +1836,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
@@ -1775,6 +1835,8 @@ void Browser::SetContentsBounds(WebContents* source, const gfx::Rect& bounds) {
}
void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@ -195,7 +195,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
if (!GetStatusBubble())
return;
@@ -1783,6 +1845,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
@@ -1782,6 +1844,17 @@ void Browser::UpdateTargetURL(WebContents* source, const GURL& url) {
GetStatusBubble()->SetURL(url);
}
@ -213,7 +213,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
void Browser::ContentsMouseEvent(WebContents* source,
bool motion,
bool exited) {
@@ -1807,6 +1880,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
@@ -1806,6 +1879,19 @@ bool Browser::TakeFocus(content::WebContents* source, bool reverse) {
return false;
}
@ -233,7 +233,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
void Browser::BeforeUnloadFired(WebContents* web_contents,
bool proceed,
bool* proceed_to_fire_unload) {
@@ -1899,6 +1985,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
@@ -1898,6 +1984,10 @@ void Browser::WebContentsCreated(WebContents* source_contents,
// Make the tab show up in the task manager.
task_manager::WebContentsTags::CreateForTabContents(new_contents);
@ -244,7 +244,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
}
void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) {
@@ -2010,11 +2100,15 @@ void Browser::EnterFullscreenModeForTab(
@@ -2009,11 +2099,15 @@ void Browser::EnterFullscreenModeForTab(
const blink::mojom::FullscreenOptions& options) {
exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab(
requesting_frame, options.display_id);
@ -260,7 +260,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
}
bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) {
@@ -2204,6 +2298,15 @@ void Browser::RequestMediaAccessPermission(
@@ -2203,6 +2297,15 @@ void Browser::RequestMediaAccessPermission(
content::WebContents* web_contents,
const content::MediaStreamRequest& request,
content::MediaResponseCallback callback) {
@ -276,7 +276,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
const extensions::Extension* extension =
GetExtensionForOrigin(profile_, request.security_origin);
MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
@@ -2744,13 +2847,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
@@ -2743,13 +2846,20 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) {
// Browser, Getters for UI (private):
StatusBubble* Browser::GetStatusBubble() {
@ -298,7 +298,7 @@ index 0fcb0295dec5d..134b0b2ccc61c 100644
return window_ ? window_->GetStatusBubble() : nullptr;
}
@@ -2884,6 +2994,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
@@ -2883,6 +2993,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) {
BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this);
web_contents_collection_.StopObserving(web_contents);
}
@ -410,10 +410,10 @@ index 23a838ba30c68..52601ebdcc9bd 100644
// The opener browser of the document picture-in-picture browser. Null if the
diff --git chrome/browser/ui/browser_navigator.cc chrome/browser/ui/browser_navigator.cc
index 9ee8a99f70bed..a2e198d987498 100644
index edf4d8c7933e9..9e7c236dbf16a 100644
--- chrome/browser/ui/browser_navigator.cc
+++ chrome/browser/ui/browser_navigator.cc
@@ -554,6 +554,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
@@ -555,6 +555,13 @@ std::unique_ptr<content::WebContents> CreateTargetContents(
std::unique_ptr<WebContents> target_contents =
WebContents::Create(create_params);

8
patch/patches/chrome_browser_content_settings.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/content_settings/host_content_settings_map_factory.cc chrome/browser/content_settings/host_content_settings_map_factory.cc
index 5e4d0b203491b..dc5c8fb36d592 100644
index 6bcdf281c430a..cee4d03ce296b 100644
--- chrome/browser/content_settings/host_content_settings_map_factory.cc
+++ chrome/browser/content_settings/host_content_settings_map_factory.cc
@@ -9,6 +9,7 @@
@ -21,7 +21,7 @@ index 5e4d0b203491b..dc5c8fb36d592 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "base/trace_event/trace_event.h"
#include "extensions/browser/api/content_settings/content_settings_custom_extension_provider.h"
@@ -63,7 +68,13 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory()
@@ -68,7 +73,13 @@ HostContentSettingsMapFactory::HostContentSettingsMapFactory()
DependsOn(OneTimePermissionsTrackerFactory::GetInstance());
#endif
#if BUILDFLAG(ENABLE_EXTENSIONS)
@ -35,7 +35,7 @@ index 5e4d0b203491b..dc5c8fb36d592 100644
#endif
// Used by way of ShouldRestoreOldSessionCookies().
#if BUILDFLAG(ENABLE_SESSION_SERVICE)
@@ -127,6 +138,9 @@ scoped_refptr<RefcountedKeyedService>
@@ -132,6 +143,9 @@ scoped_refptr<RefcountedKeyedService>
std::move(allowlist_provider));
#if BUILDFLAG(ENABLE_EXTENSIONS)
@ -45,7 +45,7 @@ index 5e4d0b203491b..dc5c8fb36d592 100644
// These must be registered before before the HostSettings are passed over to
// the IOThread. Simplest to do this on construction.
settings_map->RegisterProvider(
@@ -139,6 +153,9 @@ scoped_refptr<RefcountedKeyedService>
@@ -144,6 +158,9 @@ scoped_refptr<RefcountedKeyedService>
// the case where profile->IsOffTheRecord() is true? And what is the
// interaction with profile->IsGuestSession()?
false));

20
patch/patches/chrome_browser_context_menus.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc
index 15b3d1c767883..717ff131cadb5 100644
index 7e25c4f0656fa..446075c9dfaf7 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -319,6 +319,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -322,6 +322,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
return callback.get();
}
@ -16,7 +16,7 @@ index 15b3d1c767883..717ff131cadb5 100644
enum class UmaEnumIdLookupType {
GeneralEnumId,
ContextSpecificEnumId,
@@ -565,6 +572,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
@@ -568,6 +575,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
return 1;
@ -27,7 +27,7 @@ index 15b3d1c767883..717ff131cadb5 100644
id = CollapseCommandsForUMA(id);
const auto& map = GetIdcToUmaMap(type);
auto it = map.find(id);
@@ -785,6 +796,14 @@ RenderViewContextMenu::RenderViewContextMenu(
@@ -808,6 +819,14 @@ RenderViewContextMenu::RenderViewContextMenu(
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
pdf_ocr_submenu_model_ = std::make_unique<ui::SimpleMenuModel>(this);
#endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE)
@ -42,7 +42,7 @@ index 15b3d1c767883..717ff131cadb5 100644
}
RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1202,6 +1221,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1229,6 +1248,12 @@ void RenderViewContextMenu::InitMenu() {
// menu, meaning that each menu item added/removed in this function will cause
// it to visibly jump on the screen (see b/173569669).
AppendQuickAnswersItems();
@ -55,7 +55,7 @@ index 15b3d1c767883..717ff131cadb5 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -3164,6 +3189,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -3224,6 +3249,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}
@ -69,7 +69,7 @@ index 15b3d1c767883..717ff131cadb5 100644
RenderViewContextMenu::GetHandlersForLinkUrl() {
custom_handlers::ProtocolHandlerRegistry::ProtocolHandlerList handlers =
diff --git chrome/browser/renderer_context_menu/render_view_context_menu.h chrome/browser/renderer_context_menu/render_view_context_menu.h
index b0505bb7375ee..85b9a58b4655f 100644
index d37c3a18df476..d5c84270f0680 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -142,6 +142,12 @@ class RenderViewContextMenu
@ -85,7 +85,7 @@ index b0505bb7375ee..85b9a58b4655f 100644
protected:
Profile* GetProfile() const;
@@ -394,6 +400,9 @@ class RenderViewContextMenu
@@ -404,6 +410,9 @@ class RenderViewContextMenu
// built.
bool is_protocol_submenu_valid_ = false;
@ -96,7 +96,7 @@ index b0505bb7375ee..85b9a58b4655f 100644
// "Use enhanced spell check" items.
std::unique_ptr<SpellingMenuObserver> spelling_suggestions_menu_observer_;
diff --git chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
index b7522152d2c6d..5201ebe8268f1 100644
index 357a070bcb8e4..f4346b8daa51a 100644
--- chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
+++ chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc
@@ -149,6 +149,9 @@ void RenderViewContextMenuViews::RunMenuAt(views::Widget* parent,
@ -132,7 +132,7 @@ index 965a283dea477..74c1ee8258485 100644
command_executed_ = true;
RecordUsedItem(id);
diff --git components/renderer_context_menu/render_view_context_menu_base.h components/renderer_context_menu/render_view_context_menu_base.h
index ee6e005771119..91b5867cd16bf 100644
index 75986f68d98b4..5c51500093c1a 100644
--- components/renderer_context_menu/render_view_context_menu_base.h
+++ components/renderer_context_menu/render_view_context_menu_base.h
@@ -87,6 +87,9 @@ class RenderViewContextMenuBase : public ui::SimpleMenuModel::Delegate,

6
patch/patches/chrome_browser_dialogs_native.patch
View File

@ -139,7 +139,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
params->need_local_path ? ui::SelectFileDialog::FileTypeInfo::NATIVE_PATH
: ui::SelectFileDialog::FileTypeInfo::ANY_PATH;
diff --git chrome/browser/file_select_helper.h chrome/browser/file_select_helper.h
index a900e41ccf973..4354a90469fd9 100644
index d8d05b844383c..a18fe71e383d1 100644
--- chrome/browser/file_select_helper.h
+++ chrome/browser/file_select_helper.h
@@ -61,7 +61,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
@ -323,10 +323,10 @@ index c7acd9b05fbb8..3e95e4125fa24 100644
} // namespace ui
diff --git ui/shell_dialogs/select_file_dialog_mac.mm ui/shell_dialogs/select_file_dialog_mac.mm
index 0b8aaa3c0e4f0..fe01d3db2eabe 100644
index 7c7a929ec5c36..ef0a6328229db 100644
--- ui/shell_dialogs/select_file_dialog_mac.mm
+++ ui/shell_dialogs/select_file_dialog_mac.mm
@@ -102,6 +102,10 @@ void SelectFileDialogImpl::SelectFileImpl(
@@ -106,6 +106,10 @@ void SelectFileDialogImpl::SelectFileImpl(
mojo_window->CreateSelectFileDialog(std::move(receiver));
} else {
NSWindow* ns_window = gfx_window.GetNativeNSWindow();

18
patch/patches/chrome_browser_dialogs_widget.patch
View File

@ -12,7 +12,7 @@ index b169371e4d42f..509e4bda85b47 100644
// on the screen, we can't actually attach to it.
parent_window = nullptr;
diff --git components/constrained_window/constrained_window_views.cc components/constrained_window/constrained_window_views.cc
index 3b41c7d676b35..e76c13cd8d122 100644
index dc648ad1ae595..70698ed848990 100644
--- components/constrained_window/constrained_window_views.cc
+++ components/constrained_window/constrained_window_views.cc
@@ -101,15 +101,24 @@ void UpdateModalDialogPosition(views::Widget* widget,
@ -112,10 +112,10 @@ index 51ed6bcf6b540..9ae4737e0737e 100644
virtual gfx::Point GetDialogPosition(const gfx::Size& size) = 0;
// Returns whether a dialog currently about to be shown should be activated.
diff --git ui/views/window/dialog_delegate.cc ui/views/window/dialog_delegate.cc
index bfa3af1507a2c..89706052e11d6 100644
index 938e6ab7ca8ee..ece420f09418e 100644
--- ui/views/window/dialog_delegate.cc
+++ ui/views/window/dialog_delegate.cc
@@ -54,10 +54,12 @@ DialogDelegate::DialogDelegate() {
@@ -53,10 +53,12 @@ DialogDelegate::DialogDelegate() {
// static
Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
gfx::NativeWindow context,
@ -130,7 +130,7 @@ index bfa3af1507a2c..89706052e11d6 100644
widget->Init(std::move(params));
return widget;
}
@@ -66,17 +68,19 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
@@ -65,17 +67,19 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
Widget* DialogDelegate::CreateDialogWidget(
std::unique_ptr<WidgetDelegate> delegate,
gfx::NativeWindow context,
@ -154,7 +154,7 @@ index bfa3af1507a2c..89706052e11d6 100644
#else
return true;
#endif
@@ -87,14 +91,15 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
@@ -86,14 +90,15 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
WidgetDelegate* delegate,
gfx::NativeWindow context,
gfx::NativeView parent,
@ -172,7 +172,7 @@ index bfa3af1507a2c..89706052e11d6 100644
if (!dialog || dialog->use_custom_frame()) {
params.opacity = Widget::InitParams::WindowOpacity::kTranslucent;
@@ -107,6 +112,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
@@ -106,6 +111,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
}
params.context = context;
params.parent = parent;
@ -181,10 +181,10 @@ index bfa3af1507a2c..89706052e11d6 100644
// Web-modal (ui::MODAL_TYPE_CHILD) dialogs with parents are marked as child
// widgets to prevent top-level window behavior (independent movement, etc).
diff --git ui/views/window/dialog_delegate.h ui/views/window/dialog_delegate.h
index cb4e19385ffaa..bbe179c4607a8 100644
index fca669a962357..8a2a2acea788b 100644
--- ui/views/window/dialog_delegate.h
+++ ui/views/window/dialog_delegate.h
@@ -94,13 +94,18 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
@@ -97,13 +97,18 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
// your use case.
static Widget* CreateDialogWidget(std::unique_ptr<WidgetDelegate> delegate,
gfx::NativeWindow context,
@ -206,7 +206,7 @@ index cb4e19385ffaa..bbe179c4607a8 100644
// Returns the dialog widget InitParams for a given |context| or |parent|.
// If |bounds| is not empty, used to initially place the dialog, otherwise
@@ -108,7 +113,9 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
@@ -111,7 +116,9 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {
static Widget::InitParams GetDialogWidgetInitParams(WidgetDelegate* delegate,
gfx::NativeWindow context,
gfx::NativeView parent,

2
patch/patches/chrome_browser_frame_mac.patch
View File

@ -33,7 +33,7 @@ index ab1d8fd9bfa84..77f65b44e591a 100644
~BrowserFrameMac() override;
diff --git chrome/browser/ui/views/frame/browser_frame_mac.mm chrome/browser/ui/views/frame/browser_frame_mac.mm
index 2290270c3e159..a4a0f4b3c5a33 100644
index eb1570b99202a..6f0e0ec08539f 100644
--- chrome/browser/ui/views/frame/browser_frame_mac.mm
+++ chrome/browser/ui/views/frame/browser_frame_mac.mm
@@ -181,7 +181,14 @@ void BrowserFrameMac::OnWindowFullscreenTransitionComplete() {

8
patch/patches/chrome_browser_permission_prompt.patch
View File

@ -44,7 +44,7 @@ index 16107572d4d0d..409e9ea870482 100644
base::FeatureList::IsEnabled(
features::kPeriodicSyncPermissionForDefaultSearchEngine) &&
diff --git chrome/browser/permissions/chrome_permissions_client.cc chrome/browser/permissions/chrome_permissions_client.cc
index be69eb7fb1d65..0b92de1b0e328 100644
index dece5822d8899..855ab4273e916 100644
--- chrome/browser/permissions/chrome_permissions_client.cc
+++ chrome/browser/permissions/chrome_permissions_client.cc
@@ -14,6 +14,7 @@
@ -55,7 +55,7 @@ index be69eb7fb1d65..0b92de1b0e328 100644
#include "chrome/browser/bluetooth/bluetooth_chooser_context_factory.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ -174,6 +175,9 @@ ChromePermissionsClient::GetPermissionDecisionAutoBlocker(
@@ -175,6 +176,9 @@ ChromePermissionsClient::GetPermissionDecisionAutoBlocker(
double ChromePermissionsClient::GetSiteEngagementScore(
content::BrowserContext* browser_context,
const GURL& origin) {
@ -65,7 +65,7 @@ index be69eb7fb1d65..0b92de1b0e328 100644
return site_engagement::SiteEngagementService::Get(
Profile::FromBrowserContext(browser_context))
->GetScore(origin);
@@ -323,8 +327,10 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
@@ -332,8 +336,10 @@ ChromePermissionsClient::CreatePermissionUiSelectors(
std::make_unique<ContextualNotificationPermissionUiSelector>());
selectors.emplace_back(std::make_unique<PrefNotificationPermissionUiSelector>(
Profile::FromBrowserContext(browser_context)));
@ -77,7 +77,7 @@ index be69eb7fb1d65..0b92de1b0e328 100644
}
diff --git chrome/browser/permissions/permission_manager_factory.cc chrome/browser/permissions/permission_manager_factory.cc
index a6d47eebe0ba6..111a2e52df96f 100644
index e70f9fcc696e5..f61ee1548f8b0 100644
--- chrome/browser/permissions/permission_manager_factory.cc
+++ chrome/browser/permissions/permission_manager_factory.cc
@@ -6,6 +6,7 @@

50
patch/patches/chrome_browser_profiles.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/profiles/off_the_record_profile_impl.cc chrome/browser/profiles/off_the_record_profile_impl.cc
index ec0e1b7be7209..ea85965f1f2c9 100644
index 9eb87425e5ce8..f5f35705a09f9 100644
--- chrome/browser/profiles/off_the_record_profile_impl.cc
+++ chrome/browser/profiles/off_the_record_profile_impl.cc
@@ -664,7 +664,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
@@ -659,7 +659,9 @@ std::unique_ptr<Profile> Profile::CreateOffTheRecordProfile(
#endif
if (!profile)
profile = std::make_unique<OffTheRecordProfileImpl>(parent, otr_profile_id);
@ -52,10 +52,10 @@ index 6cffe941b26f9..3e6223ab0d423 100644
Profile::OTRProfileID Profile::OTRProfileID::CreateUniqueForDevTools() {
return CreateUnique(kDevToolsOTRProfileIDPrefix);
diff --git chrome/browser/profiles/profile.h chrome/browser/profiles/profile.h
index 5d6a5b65698c0..964541b2343de 100644
index 8b08095a9b21e..71b14e1f876cf 100644
--- chrome/browser/profiles/profile.h
+++ chrome/browser/profiles/profile.h
@@ -100,6 +100,10 @@ class Profile : public content::BrowserContext {
@@ -99,6 +99,10 @@ class Profile : public content::BrowserContext {
// be applicable to run. Please see crbug.com/1098697#c3 for more details.
static OTRProfileID CreateUnique(const std::string& profile_id_prefix);
@ -66,7 +66,7 @@ index 5d6a5b65698c0..964541b2343de 100644
// Creates a unique OTR profile id to be used for DevTools browser contexts.
static OTRProfileID CreateUniqueForDevTools();
@@ -507,6 +511,8 @@ class Profile : public content::BrowserContext {
@@ -502,6 +506,8 @@ class Profile : public content::BrowserContext {
base::WeakPtr<Profile> GetWeakPtr();
@ -75,7 +75,7 @@ index 5d6a5b65698c0..964541b2343de 100644
protected:
// Creates an OffTheRecordProfile which points to this Profile.
static std::unique_ptr<Profile> CreateOffTheRecordProfile(
@@ -518,7 +524,6 @@ class Profile : public content::BrowserContext {
@@ -513,7 +519,6 @@ class Profile : public content::BrowserContext {
static PrefStore* CreateExtensionPrefStore(Profile*,
bool incognito_pref_store);
@ -84,10 +84,10 @@ index 5d6a5b65698c0..964541b2343de 100644
// Returns whether the user has signed in this profile to an account.
diff --git chrome/browser/profiles/profile_impl.cc chrome/browser/profiles/profile_impl.cc
index 57d728da590da..fc57b690011d6 100644
index a3ee1846fcf77..13edaf1203d69 100644
--- chrome/browser/profiles/profile_impl.cc
+++ chrome/browser/profiles/profile_impl.cc
@@ -1036,7 +1036,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
@@ -1031,7 +1031,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
otr_profiles_[otr_profile_id] = std::move(otr_profile);
@ -99,10 +99,10 @@ index 57d728da590da..fc57b690011d6 100644
return raw_otr_profile;
}
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
index 2b0e6098334bf..9d7fdfc8401aa 100644
index 80acbb1473fc7..9db21208f8e81 100644
--- chrome/browser/profiles/profile_manager.cc
+++ chrome/browser/profiles/profile_manager.cc
@@ -395,7 +395,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
@@ -389,7 +389,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
base::Unretained(this)));
#endif
@ -134,7 +134,7 @@ index 60c9fd19fe15b..2a3e317d9c240 100644
// Returns the directory where the first created profile is stored,
// relative to the user data directory currently in use.
diff --git chrome/browser/profiles/renderer_updater.cc chrome/browser/profiles/renderer_updater.cc
index 884e79cd54e0d..ed47d9a7d1bb4 100644
index 884e79cd54e0d..4e840df66756d 100644
--- chrome/browser/profiles/renderer_updater.cc
+++ chrome/browser/profiles/renderer_updater.cc
@@ -9,6 +9,7 @@
@ -145,7 +145,11 @@ index 884e79cd54e0d..ed47d9a7d1bb4 100644
#include "chrome/browser/content_settings/content_settings_manager_delegate.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -49,8 +50,10 @@ RendererUpdater::RendererUpdater(Profile* profile)
@@ -46,11 +47,14 @@ RendererUpdater::RendererUpdater(Profile* profile)
#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
,
bound_session_cookie_refresh_service_(
+ cef::IsAlloyRuntimeEnabled() ? nullptr :
BoundSessionCookieRefreshServiceFactory::GetForProfile(profile))
#endif
{
@ -156,3 +160,25 @@ index 884e79cd54e0d..ed47d9a7d1bb4 100644
#if BUILDFLAG(IS_CHROMEOS_ASH)
oauth2_login_manager_ =
diff --git chrome/browser/profiles/renderer_updater_factory.cc chrome/browser/profiles/renderer_updater_factory.cc
index 908a1c3615d70..462500925f05a 100644
--- chrome/browser/profiles/renderer_updater_factory.cc
+++ chrome/browser/profiles/renderer_updater_factory.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/profiles/renderer_updater_factory.h"
+#include "cef/libcef/features/runtime.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/renderer_updater.h"
@@ -25,7 +26,9 @@ RendererUpdaterFactory::RendererUpdaterFactory()
DependsOn(IdentityManagerFactory::GetInstance());
DependsOn(HostContentSettingsMapFactory::GetInstance());
#if BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
+ if (!cef::IsAlloyRuntimeEnabled()) {
DependsOn(BoundSessionCookieRefreshServiceFactory::GetInstance());
+ }
#endif // BUILDFLAG(ENABLE_BOUND_SESSION_CREDENTIALS)
}

2
patch/patches/chrome_browser_safe_browsing.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/safe_browsing/BUILD.gn chrome/browser/safe_browsing/BUILD.gn
index aaa2a770e4c9f..8d524c456d9dc 100644
index 3dce9f70a6cd1..39119ef60c61d 100644
--- chrome/browser/safe_browsing/BUILD.gn
+++ chrome/browser/safe_browsing/BUILD.gn
@@ -32,6 +32,7 @@ static_library("safe_browsing") {

12
patch/patches/chrome_browser_themes.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/themes/theme_service.cc chrome/browser/themes/theme_service.cc
index a23a2830b374c..c6822853a6c3d 100644
index 67dc4a2e0695e..16f819e133886 100644
--- chrome/browser/themes/theme_service.cc
+++ chrome/browser/themes/theme_service.cc
@@ -30,6 +30,7 @@
@ -10,7 +10,7 @@ index a23a2830b374c..c6822853a6c3d 100644
#include "chrome/browser/browser_features.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/theme_installed_infobar_delegate.h"
@@ -66,6 +67,10 @@
@@ -68,6 +69,10 @@
#include "ui/color/color_provider.h"
#include "ui/native_theme/native_theme.h"
@ -21,7 +21,7 @@ index a23a2830b374c..c6822853a6c3d 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "base/scoped_observation.h"
#include "extensions/browser/extension_registry_observer.h"
@@ -268,11 +273,19 @@ void ThemeService::Init() {
@@ -270,11 +275,19 @@ void ThemeService::Init() {
// OnExtensionServiceReady. Otherwise, the ThemeObserver won't be
// constructed in time to observe the corresponding events.
#if BUILDFLAG(ENABLE_EXTENSIONS)
@ -42,7 +42,7 @@ index a23a2830b374c..c6822853a6c3d 100644
theme_syncable_service_ =
std::make_unique<ThemeSyncableService>(profile_, this);
diff --git chrome/browser/themes/theme_service_factory.cc chrome/browser/themes/theme_service_factory.cc
index 622dcc82663c5..7fbe022c1f78b 100644
index c8382bbee253b..a48c7b52252db 100644
--- chrome/browser/themes/theme_service_factory.cc
+++ chrome/browser/themes/theme_service_factory.cc
@@ -7,6 +7,7 @@
@ -64,8 +64,8 @@ index 622dcc82663c5..7fbe022c1f78b 100644
namespace {
const ThemeHelper& GetThemeHelper() {
@@ -74,7 +79,15 @@ ThemeServiceFactory::ThemeServiceFactory()
ProfileSelections::BuildRedirectedInIncognito()) {
@@ -79,7 +84,15 @@ ThemeServiceFactory::ThemeServiceFactory()
.Build()) {
DependsOn(extensions::ExtensionRegistryFactory::GetInstance());
DependsOn(extensions::ExtensionPrefsFactory::GetInstance());
+#if BUILDFLAG(ENABLE_CEF)

22
patch/patches/chrome_plugins.patch
View File

@ -42,10 +42,10 @@ index 8b3f569882aeb..afc8007a6228b 100644
const extensions::Extension* extension =
registry->enabled_extensions().GetByID(extension_id);
diff --git chrome/renderer/chrome_content_renderer_client.cc chrome/renderer/chrome_content_renderer_client.cc
index c5c1deb4a388c..6606f5bd417ca 100644
index ada53df4386e9..c3d4ccb8394f0 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -985,6 +985,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -984,6 +984,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@ -53,7 +53,7 @@ index c5c1deb4a388c..6606f5bd417ca 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
@@ -1152,7 +1153,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1151,7 +1152,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -63,7 +63,7 @@ index c5c1deb4a388c..6606f5bd417ca 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1161,7 +1163,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1160,7 +1162,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
l10n_util::GetStringFUTF16(IDS_PLUGIN_BLOCKED, group_name));
placeholder->AllowLoading();
RenderThread::Get()->RecordAction(UserMetricsAction("Plugin_Blocked"));
@ -73,7 +73,7 @@ index c5c1deb4a388c..6606f5bd417ca 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1171,7 +1174,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1170,7 +1173,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));
@ -105,10 +105,10 @@ index ad5f1925735fd..a871f4a7792a7 100644
BrowserPluginEmbedder(const BrowserPluginEmbedder&) = delete;
BrowserPluginEmbedder& operator=(const BrowserPluginEmbedder&) = delete;
diff --git content/browser/browser_plugin/browser_plugin_guest.cc content/browser/browser_plugin/browser_plugin_guest.cc
index a7501a57c5149..1c148767f67a6 100644
index 2e47c128f4d5c..c27d76a8227f9 100644
--- content/browser/browser_plugin/browser_plugin_guest.cc
+++ content/browser/browser_plugin/browser_plugin_guest.cc
@@ -80,6 +80,8 @@ void BrowserPluginGuest::InitInternal(WebContentsImpl* owner_web_contents) {
@@ -81,6 +81,8 @@ void BrowserPluginGuest::InitInternal(WebContentsImpl* owner_web_contents) {
GetWebContents()->GetOrCreateWebPreferences();
prefs.navigate_on_drag_drop = false;
GetWebContents()->SetWebPreferences(prefs);
@ -118,7 +118,7 @@ index a7501a57c5149..1c148767f67a6 100644
BrowserPluginGuest::~BrowserPluginGuest() = default;
diff --git content/browser/browser_plugin/browser_plugin_guest.h content/browser/browser_plugin/browser_plugin_guest.h
index 17e98b60e8f7e..41f05cdd88d40 100644
index 7f3083029d45e..94a5cbed96a10 100644
--- content/browser/browser_plugin/browser_plugin_guest.h
+++ content/browser/browser_plugin/browser_plugin_guest.h
@@ -70,6 +70,8 @@ class BrowserPluginGuest : public WebContentsObserver {
@ -130,10 +130,10 @@ index 17e98b60e8f7e..41f05cdd88d40 100644
private:
// BrowserPluginGuest is a WebContentsObserver of |web_contents| and
// |web_contents| has to stay valid for the lifetime of BrowserPluginGuest.
@@ -79,6 +81,8 @@ class BrowserPluginGuest : public WebContentsObserver {
void InitInternal(WebContentsImpl* owner_web_contents);
@@ -80,6 +82,8 @@ class BrowserPluginGuest : public WebContentsObserver {
const raw_ptr<BrowserPluginGuestDelegate, DanglingUntriaged> delegate_;
// May be null during guest destruction.
const base::WeakPtr<BrowserPluginGuestDelegate> delegate_;
+
+ raw_ptr<WebContentsImpl> owner_web_contents_ = nullptr;
};

6
patch/patches/chrome_renderer.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
index a78e96688e039..7b56e77529899 100644
index 8bb0cecdce072..308d4cd72b58e 100644
--- chrome/renderer/BUILD.gn
+++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@
@ -10,7 +10,7 @@ index a78e96688e039..7b56e77529899 100644
import("//chrome/common/features.gni")
import("//components/nacl/features.gni")
import("//components/offline_pages/buildflags/features.gni")
@@ -125,6 +126,7 @@ static_library("renderer") {
@@ -135,6 +136,7 @@ static_library("renderer") {
deps = [
"//base/allocator:buildflags",
"//build:chromeos_buildflags",
@ -18,7 +18,7 @@ index a78e96688e039..7b56e77529899 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/common",
@@ -223,6 +225,10 @@ static_library("renderer") {
@@ -234,6 +236,10 @@ static_library("renderer") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]

74
patch/patches/chrome_runtime.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
index fb5093709a104..2a69318c3e5e2 100644
index 0141f1f97e0b4..d7e1c98b68c4f 100644
--- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc
@@ -39,6 +39,7 @@
@@ -40,6 +40,7 @@
#include "base/trace_event/trace_event_impl.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -10,7 +10,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#include "chrome/browser/buildflags.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_resource_bundle_helper.h"
@@ -502,6 +503,8 @@ struct MainFunction {
@@ -503,6 +504,8 @@ struct MainFunction {
// Initializes the user data dir. Must be called before InitializeLocalState().
void InitializeUserDataDir(base::CommandLine* command_line) {
@ -19,7 +19,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#if BUILDFLAG(IS_WIN)
// Reach out to chrome_elf for the truth on the user data directory.
// Note that in tests, this links to chrome_elf_test_stubs.
@@ -651,6 +654,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
@@ -652,6 +655,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
ChromeMainDelegate::~ChromeMainDelegate() = default;
#endif // !BUILDFLAG(IS_ANDROID)
@ -30,7 +30,7 @@ index fb5093709a104..2a69318c3e5e2 100644
absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
InvokedIn invoked_in) {
DCHECK(base::ThreadPoolInstance::Get());
@@ -867,7 +874,8 @@ absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
@@ -868,7 +875,8 @@ absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
if (base::FeatureList::IsEnabled(
features::kWriteBasicSystemProfileToPersistentHistogramsFile)) {
@ -40,7 +40,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#if BUILDFLAG(IS_ANDROID)
record =
base::FeatureList::IsEnabled(chrome::android::kUmaBackgroundSessions);
@@ -1294,6 +1302,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1296,6 +1304,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
@ -48,7 +48,7 @@ index fb5093709a104..2a69318c3e5e2 100644
crash_reporter::InitializeCrashKeys();
#if BUILDFLAG(IS_POSIX)
@@ -1304,6 +1313,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1306,6 +1315,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitMacCrashReporter(command_line, process_type);
SetUpInstallerPreferences(command_line);
#endif
@ -56,7 +56,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#if BUILDFLAG(IS_WIN)
child_process_logging::Init();
@@ -1498,6 +1508,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1500,6 +1510,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -64,7 +64,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
@@ -1541,6 +1552,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1543,6 +1554,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
// After all the platform Breakpads have been initialized, store the command
// line for crash reporting.
crash_keys::SetCrashKeysFromCommandLine(command_line);
@ -72,7 +72,7 @@ index fb5093709a104..2a69318c3e5e2 100644
#if BUILDFLAG(ENABLE_PDF)
MaybePatchGdiGetFontData();
@@ -1664,6 +1676,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1666,6 +1678,7 @@ void ChromeMainDelegate::ZygoteForked() {
SetUpProfilingShutdownHandler();
}
@ -80,7 +80,7 @@ index fb5093709a104..2a69318c3e5e2 100644
// Needs to be called after we have chrome::DIR_USER_DATA. BrowserMain sets
// this up for the browser process in a different manner.
const base::CommandLine* command_line =
@@ -1686,6 +1699,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1688,6 +1701,7 @@ void ChromeMainDelegate::ZygoteForked() {
// Reset the command line for the newly spawned process.
crash_keys::SetCrashKeysFromCommandLine(*command_line);
@ -88,7 +88,7 @@ index fb5093709a104..2a69318c3e5e2 100644
}
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -1783,6 +1797,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
@@ -1785,6 +1799,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
channel == version_info::Channel::DEV);
const bool gwp_asan_boost_sampling = is_canary_dev || is_browser_process;
@ -96,7 +96,7 @@ index fb5093709a104..2a69318c3e5e2 100644
memory_system::Initializer()
.SetGwpAsanParameters(gwp_asan_boost_sampling, process_type)
.SetProfilingClientParameters(channel,
@@ -1791,5 +1806,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
@@ -1793,5 +1808,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
PoissonAllocationSamplerInclusion::kEnforce,
memory_system::DispatcherParameters::
AllocationTraceRecorderInclusion::kDynamic)
@ -126,7 +126,7 @@ index dad9f981d2e01..29baaf84465a0 100644
#if BUILDFLAG(IS_CHROMEOS_LACROS)
std::unique_ptr<chromeos::LacrosService> lacros_service_;
diff --git chrome/browser/chrome_browser_main.cc chrome/browser/chrome_browser_main.cc
index b759be27d35ab..75d3c03b748a2 100644
index 91fe738fb59f1..10e7748c43a8f 100644
--- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc
@@ -51,6 +51,7 @@
@ -137,7 +137,7 @@ index b759be27d35ab..75d3c03b748a2 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/active_use_util.h"
#include "chrome/browser/after_startup_task_utils.h"
@@ -1499,7 +1500,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1518,7 +1519,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
}
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@ -146,7 +146,7 @@ index b759be27d35ab..75d3c03b748a2 100644
// Handle special early return paths (which couldn't be processed even earlier
// as they require the process singleton to be held) first.
@@ -1546,7 +1547,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1565,7 +1566,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
return content::RESULT_CODE_NORMAL_EXIT;
#endif // BUILDFLAG(IS_WIN)
}
@ -155,7 +155,7 @@ index b759be27d35ab..75d3c03b748a2 100644
#if BUILDFLAG(IS_WIN)
// Check if there is any machine level Chrome installed on the current
@@ -1601,12 +1602,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1620,12 +1621,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
browser_process_->local_state());
}
@ -170,7 +170,7 @@ index b759be27d35ab..75d3c03b748a2 100644
#if BUILDFLAG(IS_ANDROID)
page_info::SetPageInfoClient(new ChromePageInfoClient());
@@ -1755,6 +1758,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1771,6 +1774,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -181,7 +181,7 @@ index b759be27d35ab..75d3c03b748a2 100644
// This step is costly and is already measured in
// Startup.StartupBrowserCreator_Start.
// See the comment above for an explanation of |process_command_line|.
@@ -1793,11 +1800,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1809,11 +1816,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// Create the RunLoop for MainMessageLoopRun() to use and transfer
// ownership of the browser's lifetime to the BrowserProcess.
@ -197,7 +197,7 @@ index b759be27d35ab..75d3c03b748a2 100644
#endif // !BUILDFLAG(IS_ANDROID)
diff --git chrome/browser/chrome_browser_main_mac.mm chrome/browser/chrome_browser_main_mac.mm
index d495e1a903fd8..31cf6632e831c 100644
index 789d147f0b305..64a33cce013c5 100644
--- chrome/browser/chrome_browser_main_mac.mm
+++ chrome/browser/chrome_browser_main_mac.mm
@@ -17,6 +17,7 @@
@ -235,10 +235,10 @@ index d495e1a903fd8..31cf6632e831c 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index cbaaff6894e47..db95ce1bc3a0d 100644
index 1b9db89f8dce3..980999042366a 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -40,6 +40,7 @@
@@ -41,6 +41,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -246,7 +246,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_labels_service_factory.h"
#include "chrome/browser/after_startup_task_utils.h"
@@ -1557,6 +1558,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
@@ -1538,6 +1539,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
}
ChromeContentBrowserClient::ChromeContentBrowserClient() {
@ -255,7 +255,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
#if BUILDFLAG(ENABLE_PLUGINS)
extra_parts_.push_back(
std::make_unique<ChromeContentBrowserClientPluginsPart>());
@@ -1589,6 +1592,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@@ -1570,6 +1573,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
}
}
@ -267,7 +267,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
// static
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
@@ -4386,9 +4394,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -4306,9 +4314,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID)
@ -279,7 +279,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -6307,7 +6317,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -6229,7 +6239,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
#endif
}
@ -288,7 +288,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -6325,6 +6335,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -6247,6 +6257,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@ -297,7 +297,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
}
std::vector<base::FilePath>
@@ -7314,10 +7326,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -7260,10 +7272,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -310,7 +310,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -7336,7 +7348,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -7282,7 +7294,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@ -320,7 +320,7 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -7472,7 +7485,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -7418,7 +7431,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {
@ -330,10 +330,10 @@ index cbaaff6894e47..db95ce1bc3a0d 100644
base::BindOnce(&ChromeContentBrowserClient::OnKeepaliveTimerFired,
weak_factory_.GetWeakPtr(),
diff --git chrome/browser/chrome_content_browser_client.h chrome/browser/chrome_content_browser_client.h
index 30ee8cf906f70..09e4fa568c05a 100644
index 902dcaf5df1ca..d8e698886df54 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -134,6 +134,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -135,6 +135,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
~ChromeContentBrowserClient() override;
@ -342,7 +342,7 @@ index 30ee8cf906f70..09e4fa568c05a 100644
// TODO(https://crbug.com/787567): This file is about calls from content/ out
// to chrome/ to get values or notify about events, but both of these
// functions are from chrome/ to chrome/ and don't involve content/ at all.
@@ -618,7 +620,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -617,7 +619,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
override;
void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override;
@ -351,7 +351,7 @@ index 30ee8cf906f70..09e4fa568c05a 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -998,7 +1000,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -1010,7 +1012,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if !BUILDFLAG(IS_ANDROID)
uint64_t num_keepalive_requests_ = 0;
@ -361,7 +361,7 @@ index 30ee8cf906f70..09e4fa568c05a 100644
#endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index d11c0f1334924..47f8edcf62b3a 100644
index ffc921ad54a3e..590abcaf1b49d 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -13,6 +13,7 @@
@ -383,7 +383,7 @@ index d11c0f1334924..47f8edcf62b3a 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1369,6 +1374,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1439,6 +1444,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
// This is intentionally last.
RegisterLocalStatePrefsForMigration(registry);
@ -395,7 +395,7 @@ index d11c0f1334924..47f8edcf62b3a 100644
}
// Register prefs applicable to all profiles.
@@ -1766,6 +1776,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1839,6 +1849,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
const std::string& locale) {
RegisterProfilePrefs(registry, locale);

124
patch/patches/chrome_runtime_views.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc
index 2a14f1b7c2f51..e679d7a24783b 100644
index c1f28ebc372df..275657f54c517 100644
--- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc
@@ -394,6 +394,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -395,6 +395,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
// choose to not implement CommandUpdaterDelegate inside this class and
// therefore command_updater_ doesn't have the delegate set).
if (!SupportsCommand(id) || !IsCommandEnabled(id)) {
@ -10,7 +10,7 @@ index 2a14f1b7c2f51..e679d7a24783b 100644
return false;
}
@@ -410,6 +411,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -411,6 +412,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
DCHECK(command_updater_.IsCommandEnabled(id))
<< "Invalid/disabled command " << id;
@ -24,7 +24,7 @@ index 2a14f1b7c2f51..e679d7a24783b 100644
// The order of commands in this switch statement must match the function
// declaration order in browser.h!
switch (id) {
@@ -1089,11 +1097,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
@@ -1102,11 +1110,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
// BrowserCommandController, private:
bool BrowserCommandController::IsShowingMainUI() {
@ -41,11 +41,11 @@ index 2a14f1b7c2f51..e679d7a24783b 100644
bool BrowserCommandController::IsWebAppOrCustomTab() const {
diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
index 3aa4da01852a1..59544aa46dc82 100644
index f6c50fc75faf8..30b0f9fa68554 100644
--- chrome/browser/ui/toolbar/app_menu_model.cc
+++ chrome/browser/ui/toolbar/app_menu_model.cc
@@ -169,6 +169,57 @@ absl::optional<std::u16string> GetInstallPWAAppMenuItemName(Browser* browser) {
ui::EscapeMenuLabelAmpersands(app_name));
@@ -192,6 +192,57 @@ void SetCommandIcon(ui::SimpleMenuModel* model,
}
}
+#if BUILDFLAG(ENABLE_CEF)
@ -102,7 +102,7 @@ index 3aa4da01852a1..59544aa46dc82 100644
} // namespace
////////////////////////////////////////////////////////////////////////////////
@@ -901,7 +952,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
@@ -960,7 +1011,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
return false;
}
@ -111,7 +111,7 @@ index 3aa4da01852a1..59544aa46dc82 100644
GlobalError* error =
GlobalErrorServiceFactory::GetForProfile(browser_->profile())
->GetGlobalErrorByMenuItemCommandID(command_id);
@@ -916,7 +967,7 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
@@ -975,7 +1026,7 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
}
}
@ -120,7 +120,7 @@ index 3aa4da01852a1..59544aa46dc82 100644
switch (command_id) {
case IDC_PIN_TO_START_SCREEN:
return false;
@@ -939,6 +990,34 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) const {
@@ -998,6 +1049,34 @@ bool AppMenuModel::IsCommandIdVisible(int command_id) const {
}
}
@ -155,7 +155,7 @@ index 3aa4da01852a1..59544aa46dc82 100644
bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
if ((command_id == IDC_RECENT_TABS_MENU) ||
(command_id == AppMenuModel::kMinRecentTabsCommandId)) {
@@ -1085,11 +1164,15 @@ void AppMenuModel::Build() {
@@ -1148,11 +1227,15 @@ void AppMenuModel::Build() {
}
}
@ -176,7 +176,7 @@ index 3aa4da01852a1..59544aa46dc82 100644
AddItemWithStringId(IDC_PRINT, IDS_PRINT);
@@ -1178,9 +1261,13 @@ void AppMenuModel::Build() {
@@ -1243,9 +1326,13 @@ void AppMenuModel::Build() {
kMoreToolsMenuItem);
if (!features::IsChromeRefresh2023()) {
@ -193,8 +193,8 @@ index 3aa4da01852a1..59544aa46dc82 100644
}
if (!features::IsChromeRefresh2023()) {
@@ -1265,6 +1352,11 @@ void AppMenuModel::Build() {
set_icon(IDC_EXIT, kExitMenuIcon);
@@ -1327,6 +1414,11 @@ void AppMenuModel::Build() {
SetCommandIcon(this, IDC_EXIT, kExitMenuIcon);
}
+#if BUILDFLAG(ENABLE_CEF)
@ -206,10 +206,10 @@ index 3aa4da01852a1..59544aa46dc82 100644
}
diff --git chrome/browser/ui/toolbar/app_menu_model.h chrome/browser/ui/toolbar/app_menu_model.h
index 55fb00dbc746a..396eac70f92fd 100644
index 8648fccbe4a2e..386dee69b5eff 100644
--- chrome/browser/ui/toolbar/app_menu_model.h
+++ chrome/browser/ui/toolbar/app_menu_model.h
@@ -254,6 +254,9 @@ class AppMenuModel : public ui::SimpleMenuModel,
@@ -258,6 +258,9 @@ class AppMenuModel : public ui::SimpleMenuModel,
// Appends a zoom menu (without separators).
void CreateZoomMenu();
@ -237,10 +237,10 @@ index 59024587ef6b7..0c30aa71768cf 100644
void FindBarHost::RegisterAccelerators() {
diff --git chrome/browser/ui/views/frame/browser_frame.cc chrome/browser/ui/views/frame/browser_frame.cc
index 618e1b254389e..0b5a25ffe96c3 100644
index 24b85357b90b8..67e1bacb8d518 100644
--- chrome/browser/ui/views/frame/browser_frame.cc
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -71,15 +71,23 @@ bool IsUsingLinuxSystemTheme(Profile* profile) {
@@ -75,15 +75,23 @@ bool IsUsingLinuxSystemTheme(Profile* profile) {
////////////////////////////////////////////////////////////////////////////////
// BrowserFrame, public:
@ -266,7 +266,7 @@ index 618e1b254389e..0b5a25ffe96c3 100644
}
BrowserFrame::~BrowserFrame() {}
@@ -174,6 +182,12 @@ void BrowserFrame::LayoutWebAppWindowTitle(
@@ -178,6 +186,12 @@ void BrowserFrame::LayoutWebAppWindowTitle(
}
int BrowserFrame::GetTopInset() const {
@ -279,7 +279,7 @@ index 618e1b254389e..0b5a25ffe96c3 100644
return browser_frame_view_->GetTopInset(false);
}
@@ -190,6 +204,8 @@ BrowserNonClientFrameView* BrowserFrame::GetFrameView() const {
@@ -194,6 +208,8 @@ BrowserNonClientFrameView* BrowserFrame::GetFrameView() const {
}
bool BrowserFrame::UseCustomFrame() const {
@ -288,7 +288,7 @@ index 618e1b254389e..0b5a25ffe96c3 100644
return native_browser_frame_->UseCustomFrame();
}
@@ -203,20 +219,30 @@ bool BrowserFrame::ShouldDrawFrameHeader() const {
@@ -207,20 +223,30 @@ bool BrowserFrame::ShouldDrawFrameHeader() const {
void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds,
ui::WindowShowState* show_state) const {
@ -319,16 +319,7 @@ index 618e1b254389e..0b5a25ffe96c3 100644
browser_frame_view_->OnBrowserViewInitViewsComplete();
}
@@ -278,7 +304,7 @@ const ui::ThemeProvider* BrowserFrame::GetThemeProvider() const {
ui::ColorProviderManager::ThemeInitializerSupplier*
BrowserFrame::GetCustomTheme() const {
// Do not return any custom theme if the browser has to use the dark theme.
- if (ShouldUseDarkTheme())
+ if (ShouldUseDarkTheme() || !browser_view_)
return nullptr;
Browser* browser = browser_view_->browser();
@@ -295,6 +321,8 @@ BrowserFrame::GetCustomTheme() const {
@@ -300,6 +326,8 @@ BrowserFrame::GetCustomTheme() const {
}
void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
@ -337,7 +328,7 @@ index 618e1b254389e..0b5a25ffe96c3 100644
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@@ -402,6 +430,8 @@ void BrowserFrame::SetTabDragKind(TabDragKind tab_drag_kind) {
@@ -411,6 +439,8 @@ void BrowserFrame::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
ui::ColorProviderManager::Key BrowserFrame::GetColorProviderKey() const {
auto key = Widget::GetColorProviderKey();
@ -346,7 +337,7 @@ index 618e1b254389e..0b5a25ffe96c3 100644
key.frame_type = UseCustomFrame()
? ui::ColorProviderManager::FrameType::kChromium
: ui::ColorProviderManager::FrameType::kNative;
@@ -411,6 +441,9 @@ ui::ColorProviderManager::Key BrowserFrame::GetColorProviderKey() const {
@@ -420,6 +450,9 @@ ui::ColorProviderManager::Key BrowserFrame::GetColorProviderKey() const {
}
absl::optional<SkColor> BrowserFrame::GetUserColor() const {
@ -356,16 +347,17 @@ index 618e1b254389e..0b5a25ffe96c3 100644
#if BUILDFLAG(IS_CHROMEOS_ASH)
// ChromeOS SystemWebApps use the OS theme all the time.
if (ash::IsSystemWebApp(browser_view_->browser())) {
@@ -503,5 +536,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
@@ -533,5 +566,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
}
bool BrowserFrame::ShouldUseDarkTheme() const {
+ if (!browser_view_)
+ return false;
bool BrowserFrame::IsIncognitoBrowser() const {
+ if (!browser_view_) {
+ return true;
+ }
return browser_view_->browser()->profile()->IsIncognitoProfile();
}
diff --git chrome/browser/ui/views/frame/browser_frame.h chrome/browser/ui/views/frame/browser_frame.h
index ea9371d731de0..9398b262c8d83 100644
index 795f057fedc51..54b08509919af 100644
--- chrome/browser/ui/views/frame/browser_frame.h
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -61,7 +61,9 @@ enum class TabDragKind {
@ -379,10 +371,10 @@ index ea9371d731de0..9398b262c8d83 100644
BrowserFrame(const BrowserFrame&) = delete;
BrowserFrame& operator=(const BrowserFrame&) = delete;
diff --git chrome/browser/ui/views/frame/browser_view.cc chrome/browser/ui/views/frame/browser_view.cc
index 6f9c8b1d38430..7250c21e5e781 100644
index 39a1660cae03a..f7d7965989cf7 100644
--- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -308,11 +308,10 @@ using content::NativeWebKeyboardEvent;
@@ -314,11 +314,10 @@ using content::NativeWebKeyboardEvent;
using content::WebContents;
using web_modal::WebContentsModalDialogHost;
@ -397,7 +389,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
#if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histograms that record animation smoothness for tab loading animation.
@@ -772,11 +771,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
@@ -789,11 +788,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
///////////////////////////////////////////////////////////////////////////////
// BrowserView, public:
@ -421,7 +413,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
SetShowIcon(
::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
@@ -820,7 +830,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -837,7 +847,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
}
browser_->tab_strip_model()->AddObserver(this);
@ -429,7 +421,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
// Top container holds tab strip region and toolbar and lives at the front of
// the view hierarchy.
@@ -876,8 +885,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -893,8 +902,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_));
@ -447,7 +439,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1805,6 +1821,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
@@ -1817,6 +1833,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled())
return false;
@ -456,7 +448,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
}
@@ -2703,7 +2721,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
@@ -2722,7 +2740,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
}
DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() {
@ -466,7 +458,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
if (auto* download_button = toolbar_button_provider_->GetDownloadButton())
return download_button->bubble_controller();
return nullptr;
@@ -3203,7 +3222,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
@@ -3222,7 +3241,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
if (top_container()->parent() == this)
return;
@ -476,7 +468,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0);
EnsureFocusOrder();
@@ -3756,8 +3776,10 @@ void BrowserView::Layout() {
@@ -3776,8 +3796,10 @@ void BrowserView::Layout() {
// TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -489,7 +481,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
// Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode.
@@ -3823,6 +3845,11 @@ void BrowserView::AddedToWidget() {
@@ -3843,6 +3865,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif
@ -501,7 +493,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
toolbar_->Init();
// TODO(pbos): Investigate whether the side panels should be creatable when
@@ -3869,13 +3896,9 @@ void BrowserView::AddedToWidget() {
@@ -3889,13 +3916,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder();
@ -517,7 +509,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip();
@@ -4281,7 +4304,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
@@ -4300,7 +4323,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false;
ToolbarSizeChanged(false);
@ -527,7 +519,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
}
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -4637,6 +4661,8 @@ Profile* BrowserView::GetProfile() {
@@ -4671,6 +4695,8 @@ Profile* BrowserView::GetProfile() {
}
void BrowserView::UpdateUIForTabFullscreen() {
@ -536,7 +528,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
frame()->GetFrameView()->UpdateFullscreenTopUI();
}
@@ -4659,6 +4685,8 @@ void BrowserView::HideDownloadShelf() {
@@ -4693,6 +4719,8 @@ void BrowserView::HideDownloadShelf() {
}
bool BrowserView::CanUserExitFullscreen() const {
@ -546,7 +538,7 @@ index 6f9c8b1d38430..7250c21e5e781 100644
}
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index 3eb7c4bd065e1..05ef8266d8650 100644
index 3e812382f77e6..d821b03bfa510 100644
--- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h
@@ -124,11 +124,16 @@ class BrowserView : public BrowserWindow,
@ -566,7 +558,7 @@ index 3eb7c4bd065e1..05ef8266d8650 100644
void set_frame(BrowserFrame* frame) {
frame_ = frame;
paint_as_active_subscription_ =
@@ -784,6 +789,12 @@ class BrowserView : public BrowserWindow,
@@ -783,6 +788,12 @@ class BrowserView : public BrowserWindow,
return web_app_frame_toolbar();
}
@ -625,10 +617,10 @@ index 5e059b9878fc2..c1f6fbcd40ec4 100644
ContentsWebView::~ContentsWebView() {
diff --git chrome/browser/ui/views/page_action/page_action_icon_controller.cc chrome/browser/ui/views/page_action/page_action_icon_controller.cc
index 0dcdb241b98f7..1117776bbc85c 100644
index 85a3c9eec15fe..e9a8bc50532f8 100644
--- chrome/browser/ui/views/page_action/page_action_icon_controller.cc
+++ chrome/browser/ui/views/page_action/page_action_icon_controller.cc
@@ -91,6 +91,12 @@ void PageActionIconController::Init(const PageActionIconParams& params,
@@ -93,6 +93,12 @@ void PageActionIconController::Init(const PageActionIconParams& params,
};
for (PageActionIconType type : params.types_enabled) {
@ -642,10 +634,10 @@ index 0dcdb241b98f7..1117776bbc85c 100644
case PageActionIconType::kPaymentsOfferNotification:
add_page_action_icon(
diff --git chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 73eff726270d3..be211a4a285be 100644
index 2753a95f8ff35..9745477102917 100644
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -569,33 +569,47 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
@@ -559,33 +559,47 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
}
bool BrowserTabStripController::IsFrameCondensed() const {
@ -694,10 +686,10 @@ index 73eff726270d3..be211a4a285be 100644
}
diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc
index f650013dafc56..239f6551658d0 100644
index 4682fa0f74996..099742d04102a 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -173,12 +173,13 @@ constexpr int kToolbarDividerSpacing = 9;
@@ -175,12 +175,13 @@ constexpr int kBrowserAppMenuRefreshCollapsedMargin = 2;
////////////////////////////////////////////////////////////////////////////////
// ToolbarView, public:
@ -713,7 +705,7 @@ index f650013dafc56..239f6551658d0 100644
SetID(VIEW_ID_TOOLBAR);
if (display_mode_ == DisplayMode::NORMAL) {
@@ -200,6 +201,19 @@ ToolbarView::~ToolbarView() {
@@ -202,6 +203,19 @@ ToolbarView::~ToolbarView() {
}
void ToolbarView::Init() {
@ -733,7 +725,7 @@ index f650013dafc56..239f6551658d0 100644
#if defined(USE_AURA)
// Avoid generating too many occlusion tracking calculation events before this
// function returns. The occlusion status will be computed only once once this
@@ -209,12 +223,13 @@ void ToolbarView::Init() {
@@ -211,12 +225,13 @@ void ToolbarView::Init() {
#endif
auto location_bar = std::make_unique<LocationBarView>(
browser_, browser_->profile(), browser_->command_controller(), this,
@ -749,7 +741,7 @@ index f650013dafc56..239f6551658d0 100644
download_button =
std::make_unique<DownloadToolbarButtonView>(browser_view_);
}
@@ -295,8 +310,10 @@ void ToolbarView::Init() {
@@ -297,8 +312,10 @@ void ToolbarView::Init() {
}
}
std::unique_ptr<media_router::CastToolbarButton> cast;
@ -761,7 +753,7 @@ index f650013dafc56..239f6551658d0 100644
std::unique_ptr<MediaToolbarButtonView> media_button;
if (base::FeatureList::IsEnabled(media::kGlobalMediaControls)) {
@@ -306,7 +323,8 @@ void ToolbarView::Init() {
@@ -308,7 +325,8 @@ void ToolbarView::Init() {
std::unique_ptr<send_tab_to_self::SendTabToSelfToolbarIconView>
send_tab_to_self_button;
@ -771,7 +763,7 @@ index f650013dafc56..239f6551658d0 100644
send_tab_to_self_button =
std::make_unique<send_tab_to_self::SendTabToSelfToolbarIconView>(
browser_view_);
@@ -314,7 +332,7 @@ void ToolbarView::Init() {
@@ -316,7 +334,7 @@ void ToolbarView::Init() {
std::unique_ptr<SidePanelToolbarButton> side_panel_button;
std::unique_ptr<SidePanelToolbarContainer> side_panel_toolbar_container;
@ -781,7 +773,7 @@ index f650013dafc56..239f6551658d0 100644
companion::features::kSidePanelCompanion)) {
side_panel_toolbar_container =
diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h
index b3c20d4eaf0b3..62aef2fbc752d 100644
index c38f2b0545d21..fe9a92b2f610c 100644
--- chrome/browser/ui/views/toolbar/toolbar_view.h
+++ chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -89,7 +89,8 @@ class ToolbarView : public views::AccessiblePaneView,

4
patch/patches/component_build.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
index 108bab494ea98..97ec37795ce8b 100644
index e36b1e99fb93d..1b7c458666cea 100644
--- content/browser/devtools/devtools_instrumentation.h
+++ content/browser/devtools/devtools_instrumentation.h
@@ -100,7 +100,7 @@ bool ApplyUserAgentMetadataOverrides(
@@ -101,7 +101,7 @@ bool ApplyUserAgentMetadataOverrides(
FrameTreeNode* frame_tree_node,
absl::optional<blink::UserAgentMetadata>* override_out);

40
patch/patches/content_2015.patch
View File

@ -12,10 +12,10 @@ index f4f583be8fba9..a2ed253f3724d 100644
version.Set("V8-Version", V8_VERSION_STRING);
std::string host = info.GetHeaderValue("host");
diff --git content/browser/loader/navigation_url_loader_impl.cc content/browser/loader/navigation_url_loader_impl.cc
index ddd5d5f136346..51c55f7108ddf 100644
index 4438dea521489..987aa9714bd1c 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -733,6 +733,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() {
@@ -749,6 +749,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() {
resource_request_->has_user_gesture, initiating_origin,
initiator_document_.AsRenderFrameHostIfValid(), &loader_factory);
@ -34,7 +34,7 @@ index ddd5d5f136346..51c55f7108ddf 100644
factory = base::MakeRefCounted<network::WrapperSharedURLLoaderFactory>(
std::move(loader_factory));
diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc
index f9c88663946a9..f9a78d6468364 100644
index a5ea7baed1f09..8f3f679aed305 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -986,7 +986,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
@ -55,7 +55,7 @@ index f9c88663946a9..f9a78d6468364 100644
std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index a60c4455d1d7d..1f0f0db3d8cad 100644
index 3db43fde00af4..1be6b3926fcd3 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -37,6 +37,7 @@
@ -66,7 +66,7 @@ index a60c4455d1d7d..1f0f0db3d8cad 100644
#include "content/public/common/alternative_error_page_override_info.mojom-forward.h"
#include "content/public/common/page_visibility_state.h"
#include "content/public/common/window_container_type.mojom-forward.h"
@@ -1812,7 +1813,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1815,7 +1816,7 @@ class CONTENT_EXPORT ContentBrowserClient {
//
// If |relative_partition_path| is the empty string, it means this needs to
// create the default NetworkContext for the BrowserContext.
@ -75,7 +75,7 @@ index a60c4455d1d7d..1f0f0db3d8cad 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -2020,6 +2021,19 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2023,6 +2024,19 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@ -95,7 +95,7 @@ index a60c4455d1d7d..1f0f0db3d8cad 100644
// Creates an OverlayWindow to be used for video or Picture-in-Picture.
// This window will house the content shown when in Picture-in-Picture mode.
// This will return a new OverlayWindow.
@@ -2076,6 +2090,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2079,6 +2093,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@ -107,7 +107,7 @@ index a60c4455d1d7d..1f0f0db3d8cad 100644
// on blink::features::kUserAgentReduction. Content may cache this value.
virtual std::string GetUserAgent();
diff --git content/public/renderer/content_renderer_client.h content/public/renderer/content_renderer_client.h
index 77f2c4fbf8c88..ddbacedde912a 100644
index 834a07bb92d77..64e72df7a6abc 100644
--- content/public/renderer/content_renderer_client.h
+++ content/public/renderer/content_renderer_client.h
@@ -96,6 +96,9 @@ class CONTENT_EXPORT ContentRendererClient {
@ -120,7 +120,7 @@ index 77f2c4fbf8c88..ddbacedde912a 100644
// Notifies that a new RenderFrame has been created.
virtual void RenderFrameCreated(RenderFrame* render_frame) {}
@@ -315,6 +318,10 @@ class CONTENT_EXPORT ContentRendererClient {
@@ -313,6 +316,10 @@ class CONTENT_EXPORT ContentRendererClient {
// This method may invalidate the frame.
virtual void RunScriptsAtDocumentIdle(RenderFrame* render_frame) {}
@ -132,10 +132,10 @@ index 77f2c4fbf8c88..ddbacedde912a 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index a614d8eb1ecd3..51986244b8960 100644
index 6b37ab029be69..d8d33d81ca246 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -624,6 +624,8 @@ void RenderThreadImpl::Init() {
@@ -626,6 +626,8 @@ void RenderThreadImpl::Init() {
GetContentClient()->renderer()->CreateURLLoaderThrottleProvider(
blink::URLLoaderThrottleProviderType::kFrame);
@ -145,10 +145,10 @@ index a614d8eb1ecd3..51986244b8960 100644
base::BindRepeating(&RenderThreadImpl::OnRendererInterfaceReceiver,
base::Unretained(this)));
diff --git content/renderer/renderer_blink_platform_impl.cc content/renderer/renderer_blink_platform_impl.cc
index f84c233c3b069..a9fe097a3a438 100644
index 58caad274969f..1584a5b3ed0cb 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -974,6 +974,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
@@ -961,6 +961,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
//------------------------------------------------------------------------------
@ -165,12 +165,12 @@ index f84c233c3b069..a9fe097a3a438 100644
RendererBlinkPlatformImpl::CreateWebV8ValueConverter() {
return std::make_unique<V8ValueConverterImpl>();
diff --git content/renderer/renderer_blink_platform_impl.h content/renderer/renderer_blink_platform_impl.h
index 9c66a331c615b..822f9492fa50c 100644
index 2a01122b62190..ad09cca7df98a 100644
--- content/renderer/renderer_blink_platform_impl.h
+++ content/renderer/renderer_blink_platform_impl.h
@@ -229,6 +229,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
base::TimeDelta MinimumIntervalOfUserLevelMemoryPressureSignal() override;
#endif
@@ -228,6 +228,9 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : public BlinkPlatformImpl {
InertAndMinimumIntervalOfUserLevelMemoryPressureSignal() override;
#endif // BUILDFLAG(IS_ANDROID)
+ void DevToolsAgentAttached() override;
+ void DevToolsAgentDetached() override;
@ -179,10 +179,10 @@ index 9c66a331c615b..822f9492fa50c 100644
// plus eTLD+1, such as https://google.com), or to a more specific origin.
void SetIsLockedToSite();
diff --git headless/lib/browser/headless_content_browser_client.cc headless/lib/browser/headless_content_browser_client.cc
index b9f50848e2e75..3ac9b7c3d088a 100644
index 2a26ffc86c946..ee88229940a74 100644
--- headless/lib/browser/headless_content_browser_client.cc
+++ headless/lib/browser/headless_content_browser_client.cc
@@ -299,7 +299,7 @@ bool HeadlessContentBrowserClient::IsSharedStorageSelectURLAllowed(
@@ -298,7 +298,7 @@ bool HeadlessContentBrowserClient::IsSharedStorageSelectURLAllowed(
return true;
}
@ -191,7 +191,7 @@ index b9f50848e2e75..3ac9b7c3d088a 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -309,6 +309,7 @@ void HeadlessContentBrowserClient::ConfigureNetworkContextParams(
@@ -308,6 +308,7 @@ void HeadlessContentBrowserClient::ConfigureNetworkContextParams(
HeadlessBrowserContextImpl::From(context)->ConfigureNetworkContextParams(
in_memory, relative_partition_path, network_context_params,
cert_verifier_creation_params);

8
patch/patches/content_main_654986.patch
View File

@ -94,7 +94,7 @@ index 3062f57603321..d8532c9c2eabb 100644
}
diff --git content/app/content_main_runner_impl.cc content/app/content_main_runner_impl.cc
index 38c5f465d8e45..762c4b7562d55 100644
index fa26be0ffd110..f231ab04022e3 100644
--- content/app/content_main_runner_impl.cc
+++ content/app/content_main_runner_impl.cc
@@ -46,6 +46,7 @@
@ -105,7 +105,7 @@ index 38c5f465d8e45..762c4b7562d55 100644
#include "base/time/time.h"
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
@@ -1316,6 +1317,12 @@ void ContentMainRunnerImpl::Shutdown() {
@@ -1324,6 +1325,12 @@ void ContentMainRunnerImpl::Shutdown() {
is_shutdown_ = true;
}
@ -154,10 +154,10 @@ index 283161145d792..9f3f635abdd1c 100644
if (main_argv)
setproctitle_init(main_argv);
diff --git content/public/app/content_main.h content/public/app/content_main.h
index a1eeb534c0743..aac5194a44efb 100644
index baf8a17691bac..9e6b32c9c3692 100644
--- content/public/app/content_main.h
+++ content/public/app/content_main.h
@@ -100,6 +100,13 @@ struct CONTENT_EXPORT ContentMainParams {
@@ -96,6 +96,13 @@ struct CONTENT_EXPORT ContentMainParams {
}
};

36
patch/patches/crashpad_1995.patch
View File

@ -262,10 +262,10 @@ index a604df7a5ea6a..618fbde10a65c 100644
} // namespace crash_reporter
diff --git components/crash/core/app/crashpad.cc components/crash/core/app/crashpad.cc
index 55ae5145e81a4..81daed959d336 100644
index 9ea9021f16006..cf187495ff3f0 100644
--- components/crash/core/app/crashpad.cc
+++ components/crash/core/app/crashpad.cc
@@ -130,7 +130,8 @@ bool InitializeCrashpadImpl(bool initial_client,
@@ -129,7 +129,8 @@ bool InitializeCrashpadImpl(bool initial_client,
// fallback. Forwarding is turned off for debug-mode builds even for the
// browser process, because the system's crash reporter can take a very long
// time to chew on symbols.
@ -349,12 +349,12 @@ index 99efa6b245b99..008eb397332c2 100644
annotations, arguments, false, false));
} else {
diff --git components/crash/core/app/crashpad_mac.mm components/crash/core/app/crashpad_mac.mm
index cab2c95eee53e..06e6f61ebccb1 100644
index d7351f4a912b3..6f1577533d3e9 100644
--- components/crash/core/app/crashpad_mac.mm
+++ components/crash/core/app/crashpad_mac.mm
@@ -16,11 +16,14 @@
@@ -17,11 +17,14 @@
#include "base/check.h"
#include "base/files/file_path.h"
#include "base/mac/bundle_locations.h"
#include "base/mac/foundation_util.h"
+#include "base/path_service.h"
#include "base/strings/string_number_conversions.h"
@ -367,10 +367,10 @@ index cab2c95eee53e..06e6f61ebccb1 100644
#include "third_party/crashpad/crashpad/client/crash_report_database.h"
#include "third_party/crashpad/crashpad/client/crashpad_client.h"
#include "third_party/crashpad/crashpad/client/crashpad_info.h"
@@ -38,14 +41,24 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
@@ -43,15 +46,25 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
std::map<std::string, std::string> process_annotations;
@autoreleasepool {
NSBundle* outer_bundle = base::mac::OuterBundle();
NSBundle* outer_bundle = base::apple::OuterBundle();
+ CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
+ const char* product_name = "";
+ const char* product_version = "";
@ -382,12 +382,14 @@ index cab2c95eee53e..06e6f61ebccb1 100644
- process_annotations["prod"] = "Chrome_Mac";
+ process_annotations["product"] = "Chrome_Mac";
#else
- NSString* product = base::mac::ObjCCast<NSString>([outer_bundle
- objectForInfoDictionaryKey:base::mac::CFToNSCast(kCFBundleNameKey)]);
- NSString* product = base::mac::ObjCCast<NSString>(
- [outer_bundle objectForInfoDictionaryKey:base::apple::CFToNSPtrCast(
- kCFBundleNameKey)]);
- process_annotations["prod"] =
- base::SysNSStringToUTF8(product).append("_Mac");
+ NSString* product = base::mac::ObjCCast<NSString>([outer_bundle
+ objectForInfoDictionaryKey:base::mac::CFToNSCast(kCFBundleNameKey)]);
+ NSString* product = base::mac::ObjCCast<NSString>(
+ [outer_bundle objectForInfoDictionaryKey:base::apple::CFToNSPtrCast(
+ kCFBundleNameKey)]);
+ process_annotations["product"] =
+ base::SysNSStringToUTF8(product).append("_Mac");
#endif
@ -397,17 +399,17 @@ index cab2c95eee53e..06e6f61ebccb1 100644
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
// Empty means stable.
@@ -76,12 +89,20 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
@@ -82,12 +95,20 @@ std::map<std::string, std::string> GetProcessSimpleAnnotations() {
}
}
- NSString* version =
- base::mac::ObjCCast<NSString>([base::mac::FrameworkBundle()
- base::mac::ObjCCast<NSString>([base::apple::FrameworkBundle()
- objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
- process_annotations["ver"] = base::SysNSStringToUTF8(version);
+ if (strlen(product_version) == 0) {
+ NSString* version =
+ base::mac::ObjCCast<NSString>([base::mac::FrameworkBundle()
+ base::mac::ObjCCast<NSString>([base::apple::FrameworkBundle()
+ objectForInfoDictionaryKey:@"CFBundleShortVersionString"]);
+ process_annotations["version"] = base::SysNSStringToUTF8(version);
+ } else {
@ -423,11 +425,11 @@ index cab2c95eee53e..06e6f61ebccb1 100644
} // @autoreleasepool
return process_annotations;
}();
@@ -141,10 +162,10 @@ bool PlatformCrashpadInitialization(
@@ -147,10 +168,10 @@ bool PlatformCrashpadInitialization(
if (initial_client) {
@autoreleasepool {
- base::FilePath framework_bundle_path = base::mac::FrameworkBundlePath();
- base::FilePath framework_bundle_path = base::apple::FrameworkBundlePath();
- base::FilePath handler_path =
- framework_bundle_path.Append("Helpers").Append(
- "chrome_crashpad_handler");
@ -438,7 +440,7 @@ index cab2c95eee53e..06e6f61ebccb1 100644
// Is there a way to recover if this fails?
CrashReporterClient* crash_reporter_client = GetCrashReporterClient();
@@ -173,6 +194,12 @@ bool PlatformCrashpadInitialization(
@@ -179,6 +200,12 @@ bool PlatformCrashpadInitialization(
"--reset-own-crash-exception-port-to-system-default");
}

10
patch/patches/embedder_product_override.patch
View File

@ -1,8 +1,8 @@
diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
index 86e97af7108a5..1da2d83d72a23 100644
index 13c7a8525dee2..450c496570bcc 100644
--- components/embedder_support/user_agent_utils.cc
+++ components/embedder_support/user_agent_utils.cc
@@ -17,6 +17,7 @@
@@ -18,6 +18,7 @@
#include "base/version.h"
#include "build/branding_buildflags.h"
#include "build/build_config.h"
@ -10,7 +10,7 @@ index 86e97af7108a5..1da2d83d72a23 100644
#include "components/embedder_support/pref_names.h"
#include "components/embedder_support/switches.h"
#include "components/policy/core/common/policy_pref_names.h"
@@ -37,6 +38,10 @@
@@ -38,6 +39,10 @@
#include "base/win/windows_version.h"
#endif // BUILDFLAG(IS_WIN)
@ -21,7 +21,7 @@ index 86e97af7108a5..1da2d83d72a23 100644
namespace embedder_support {
namespace {
@@ -351,6 +356,14 @@ std::string GetMajorVersionForUserAgentString(
@@ -350,6 +355,14 @@ std::string GetMajorVersionForUserAgentString(
std::string GetProductAndVersion(
ForceMajorVersionToMinorPosition force_major_to_minor,
UserAgentReductionEnterprisePolicyState user_agent_reduction) {
@ -35,4 +35,4 @@ index 86e97af7108a5..1da2d83d72a23 100644
+
if (ShouldForceMajorVersionToMinorPosition(force_major_to_minor)) {
// Force major version to 99 and major version to minor version position.
if (ShouldReduceUserAgentMinorVersion(user_agent_reduction)) {
return "Chrome/" + (ShouldReduceUserAgentMinorVersion(user_agent_reduction)

6
patch/patches/extensions_1947.patch
View File

@ -198,7 +198,7 @@ index c3197eb4790fa..1e7ae767b0582 100644
}
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index 95cec35bfe57f..1479ac9fc29f8 100644
index de61251db35b6..ad94482e2e7db 100644
--- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h
@@ -31,6 +31,7 @@
@ -217,7 +217,7 @@ index 95cec35bfe57f..1479ac9fc29f8 100644
class ExtensionHostDelegate;
class ExtensionSet;
class ExtensionSystem;
@@ -250,6 +252,14 @@ class ExtensionsBrowserClient {
@@ -247,6 +249,14 @@ class ExtensionsBrowserClient {
virtual std::unique_ptr<ExtensionHostDelegate>
CreateExtensionHostDelegate() = 0;
@ -233,7 +233,7 @@ index 95cec35bfe57f..1479ac9fc29f8 100644
// once each time the extensions system is loaded per browser_context. The
// implementation may wish to use the BrowserContext to record the current
diff --git extensions/browser/process_manager.cc extensions/browser/process_manager.cc
index 73234aa98d4a7..bcf409cd09e3f 100644
index e885327697fb9..7dc4c91069762 100644
--- extensions/browser/process_manager.cc
+++ extensions/browser/process_manager.cc
@@ -377,9 +377,17 @@ bool ProcessManager::CreateBackgroundHost(const Extension* extension,

4
patch/patches/gn_config.patch
View File

@ -12,7 +12,7 @@ index a9b0a5a827fc8..9a0fd388756f3 100644
# https://crbug.com/474506.
"//clank/java/BUILD.gn",
diff --git BUILD.gn BUILD.gn
index 27ef75902d11e..5c9ab8a865ff4 100644
index ea3d57d093740..bad302160e7c9 100644
--- BUILD.gn
+++ BUILD.gn
@@ -19,6 +19,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@ -31,7 +31,7 @@ index 27ef75902d11e..5c9ab8a865ff4 100644
+ deps += [ "//cef" ]
+ }
+
if (enable_printing) {
if (enable_printing || enable_printing_unittests) {
deps += [ "//printing:printing_unittests" ]
}
diff --git build/config/win/visual_studio_version.gni build/config/win/visual_studio_version.gni

4
patch/patches/gritsettings.patch
View File

@ -1,8 +1,8 @@
diff --git tools/gritsettings/resource_ids.spec tools/gritsettings/resource_ids.spec
index e929bcf589914..85c7b4cc754bc 100644
index 99f8fb6dbfd4c..20fc423ee927f 100644
--- tools/gritsettings/resource_ids.spec
+++ tools/gritsettings/resource_ids.spec
@@ -1134,6 +1134,15 @@
@@ -1144,6 +1144,15 @@
# END "everything else" section.
# Everything but chrome/, components/, content/, and ios/

4
patch/patches/linux_glib_deprecated_volatile.patch
View File

@ -1,8 +1,8 @@
diff --git ui/accessibility/platform/BUILD.gn ui/accessibility/platform/BUILD.gn
index ebc2470893838..dd3b924499c9c 100644
index c9777e07fdd31..3858ce8c28cb3 100644
--- ui/accessibility/platform/BUILD.gn
+++ ui/accessibility/platform/BUILD.gn
@@ -285,6 +285,10 @@ component("platform") {
@@ -286,6 +286,10 @@ component("platform") {
if (use_gio) {
configs += [ "//build/linux:gio_config" ]
}

4
patch/patches/message_loop.patch
View File

@ -1,5 +1,5 @@
diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
index f46c03e60b101..f94d0d563412d 100644
index e6d84c4bbdaae..d6f75f348235f 100644
--- base/message_loop/message_pump_win.cc
+++ base/message_loop/message_pump_win.cc
@@ -2,6 +2,7 @@
@ -10,7 +10,7 @@ index f46c03e60b101..f94d0d563412d 100644
#include "base/message_loop/message_pump_win.h"
#include <algorithm>
@@ -496,7 +497,17 @@ bool MessagePumpForUI::ProcessNextWindowsMessage() {
@@ -495,7 +496,17 @@ bool MessagePumpForUI::ProcessNextWindowsMessage() {
ctx.event()->set_chrome_message_pump();
msg_pump_data->set_sent_messages_in_queue(more_work_is_plausible);
});

2
patch/patches/mime_handler_view_guest_1565_2727.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/web_contents/web_contents_view.h content/browser/web_contents/web_contents_view.h
index ddf25382e49fc..fe64fa31a7a85 100644
index a3f8485e40bbc..dc8c1aa898f72 100644
--- content/browser/web_contents/web_contents_view.h
+++ content/browser/web_contents/web_contents_view.h
@@ -25,7 +25,7 @@ struct DropData;

4
patch/patches/net_cookie_flags.patch
View File

@ -24,10 +24,10 @@ index 78206280cfbb8..5a7499747956b 100644
bool URLRequestHttpJob::IsPartitionedCookiesEnabled() const {
diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc
index 6d42ae691a2c4..27c98529f7881 100644
index f59007a90f6a9..acf35092949a6 100644
--- services/network/public/cpp/resource_request.cc
+++ services/network/public/cpp/resource_request.cc
@@ -285,7 +285,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
@@ -286,7 +286,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
}
bool ResourceRequest::SendsCookies() const {

6
patch/patches/osr_fling_2745.patch
View File

@ -41,10 +41,10 @@ index afefe3cd83dee..6668463247644 100644
} // namespace content
diff --git content/browser/renderer_host/render_widget_host_impl.cc content/browser/renderer_host/render_widget_host_impl.cc
index e45129c031d9c..2d2392117a8a0 100644
index 48e6fa3d8447e..2972566646730 100644
--- content/browser/renderer_host/render_widget_host_impl.cc
+++ content/browser/renderer_host/render_widget_host_impl.cc
@@ -3152,6 +3152,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
@@ -3265,6 +3265,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
}
@ -57,7 +57,7 @@ index e45129c031d9c..2d2392117a8a0 100644
const WebInputEvent& event) {
if ((base::FeatureList::IsEnabled(
diff --git content/browser/renderer_host/render_widget_host_impl.h content/browser/renderer_host/render_widget_host_impl.h
index d93a3647c1150..423e2ced1d572 100644
index fd91b2f251938..da0fb34b4606f 100644
--- content/browser/renderer_host/render_widget_host_impl.h
+++ content/browser/renderer_host/render_widget_host_impl.h
@@ -796,6 +796,7 @@ class CONTENT_EXPORT RenderWidgetHostImpl

20
patch/patches/print_preview_123.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/download/download_prefs.cc chrome/browser/download/download_prefs.cc
index 3a236b6752338..620c283a52db9 100644
index 33c15415b9574..fa8ca952ca658 100644
--- chrome/browser/download/download_prefs.cc
+++ chrome/browser/download/download_prefs.cc
@@ -24,6 +24,7 @@
@@ -23,6 +23,7 @@
#include "base/strings/utf_string_conversions.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -10,7 +10,7 @@ index 3a236b6752338..620c283a52db9 100644
#include "chrome/browser/download/chrome_download_manager_delegate.h"
#include "chrome/browser/download/download_core_service_factory.h"
#include "chrome/browser/download/download_core_service_impl.h"
@@ -64,6 +65,10 @@
@@ -63,6 +64,10 @@
#include "chrome/browser/download/bubble/download_bubble_prefs.h"
#endif
@ -21,7 +21,7 @@ index 3a236b6752338..620c283a52db9 100644
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
@@ -361,6 +366,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
@@ -357,6 +362,11 @@ DownloadPrefs* DownloadPrefs::FromDownloadManager(
// static
DownloadPrefs* DownloadPrefs::FromBrowserContext(
content::BrowserContext* context) {
@ -34,7 +34,7 @@ index 3a236b6752338..620c283a52db9 100644
}
diff --git chrome/browser/printing/print_preview_dialog_controller.cc chrome/browser/printing/print_preview_dialog_controller.cc
index 897184766020b..42a2991f3f31c 100644
index a2f8a47b29a27..5d0da7d766d76 100644
--- chrome/browser/printing/print_preview_dialog_controller.cc
+++ chrome/browser/printing/print_preview_dialog_controller.cc
@@ -15,6 +15,7 @@
@ -44,7 +44,7 @@ index 897184766020b..42a2991f3f31c 100644
+#include "cef/libcef/features/features.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/printing/print_view_manager.h"
#include "chrome/browser/task_manager/web_contents_tags.h"
#include "chrome/browser/printing/print_view_manager_base.h"
diff --git chrome/browser/resources/print_preview/ui/destination_dialog.html chrome/browser/resources/print_preview/ui/destination_dialog.html
index 5d1658999d5bb..d1b7b7288c946 100644
--- chrome/browser/resources/print_preview/ui/destination_dialog.html
@ -84,10 +84,10 @@ index d5767fe27db0d..5778847a68208 100644
}
diff --git chrome/browser/ui/webui/print_preview/print_preview_ui.cc chrome/browser/ui/webui/print_preview/print_preview_ui.cc
index 641551c50c9f0..86d5e597626b4 100644
index 7afee9ec16059..5686f028d7e69 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -22,6 +22,7 @@
@@ -23,6 +23,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -95,7 +95,7 @@ index 641551c50c9f0..86d5e597626b4 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/pdf/pdf_extension_util.h"
#include "chrome/browser/policy/management_utils.h"
@@ -100,6 +101,13 @@ const char16_t kBasicPrintShortcut[] = u"\u0028\u21e7\u2318\u0050\u0029";
@@ -101,6 +102,13 @@ const char16_t kBasicPrintShortcut[] = u"(\u2325\u2318P)";
const char16_t kBasicPrintShortcut[] = u"(Ctrl+Shift+P)";
#endif
@ -109,7 +109,7 @@ index 641551c50c9f0..86d5e597626b4 100644
constexpr char kInvalidArgsForDidStartPreview[] =
"Invalid arguments for DidStartPreview";
constexpr char kInvalidPageNumberForDidPreviewPage[] =
@@ -326,7 +334,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
@@ -285,7 +293,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
source->AddLocalizedStrings(kLocalizedStrings);
#if !BUILDFLAG(IS_CHROMEOS)

4
patch/patches/renderer_host_1070713.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_view_host_impl.cc content/browser/renderer_host/render_view_host_impl.cc
index 43c8a9913c4b3..0de9549168097 100644
index 3b059b6121562..d2e343643e593 100644
--- content/browser/renderer_host/render_view_host_impl.cc
+++ content/browser/renderer_host/render_view_host_impl.cc
@@ -692,6 +692,8 @@ bool RenderViewHostImpl::IsRenderViewLive() const {
@@ -697,6 +697,8 @@ bool RenderViewHostImpl::IsRenderViewLive() const {
}
void RenderViewHostImpl::SetBackgroundOpaque(bool opaque) {

10
patch/patches/resource_bundle_2512.patch
View File

@ -1,8 +1,8 @@
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
index c6b1c58758df8..0e55c70e938d3 100644
index 9c2ec4298fa8d..c8114659affc9 100644
--- ui/base/resource/resource_bundle.cc
+++ ui/base/resource/resource_bundle.cc
@@ -909,6 +909,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
@@ -934,6 +934,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)
: delegate_(delegate),
locale_resources_data_lock_(new base::Lock),
max_scale_factor_(k100Percent) {
@ -15,7 +15,7 @@ index c6b1c58758df8..0e55c70e938d3 100644
mangle_localized_strings_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
switches::kMangleLocalizedStrings);
}
@@ -918,6 +924,11 @@ ResourceBundle::~ResourceBundle() {
@@ -943,6 +949,11 @@ ResourceBundle::~ResourceBundle() {
UnloadLocaleResources();
}
@ -28,10 +28,10 @@ index c6b1c58758df8..0e55c70e938d3 100644
void ResourceBundle::InitSharedInstance(Delegate* delegate) {
DCHECK(g_shared_instance_ == nullptr) << "ResourceBundle initialized twice";
diff --git ui/base/resource/resource_bundle.h ui/base/resource/resource_bundle.h
index a60f965097653..4e7819d776a2c 100644
index c24f5faf14d3f..96d4f6be11588 100644
--- ui/base/resource/resource_bundle.h
+++ ui/base/resource/resource_bundle.h
@@ -220,6 +220,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
@@ -219,6 +219,11 @@ class COMPONENT_EXPORT(UI_BASE) ResourceBundle {
ResourceBundle(const ResourceBundle&) = delete;
ResourceBundle& operator=(const ResourceBundle&) = delete;

4
patch/patches/rwh_background_color_1984.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/renderer_host/render_widget_host_view_aura.cc content/browser/renderer_host/render_widget_host_view_aura.cc
index c295b6c6bd54f..3c0f5a64baa6d 100644
index 680ac2d851294..f8c1a8b64b2c4 100644
--- content/browser/renderer_host/render_widget_host_view_aura.cc
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -6,6 +6,7 @@
@ -27,7 +27,7 @@ index c295b6c6bd54f..3c0f5a64baa6d 100644
}
absl::optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
@@ -2270,6 +2273,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
@@ -2284,6 +2287,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
// This needs to happen only after |window_| has been initialized using
// Init(), because it needs to have the layer.
window_->SetEmbedFrameSinkId(frame_sink_id_);

28
patch/patches/services_network_2622.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
index ac27e4f66e56f..18a36a58faf01 100644
index b30891c5efe8d..4b411229d5251 100644
--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
@@ -23,6 +23,7 @@
@ -10,18 +10,18 @@ index ac27e4f66e56f..18a36a58faf01 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/analysis/analysis_settings.h"
#include "chrome/browser/enterprise/connectors/analysis/content_analysis_dialog.h"
@@ -243,6 +244,9 @@ bool ContentAnalysisDelegate::IsEnabled(
GURL url,
Data* data,
enterprise_connectors::AnalysisConnector connector) {
@@ -246,6 +247,9 @@ bool ContentAnalysisDelegate::IsEnabled(Profile* profile,
GURL url,
Data* data,
AnalysisConnector connector) {
+ if (cef::IsAlloyRuntimeEnabled())
+ return false;
+
auto* service =
enterprise_connectors::ConnectorsServiceFactory::GetForBrowserContext(
profile);
auto* service = ConnectorsServiceFactory::GetForBrowserContext(profile);
// If the corresponding Connector policy isn't set, don't perform scans.
if (!service || !service->IsConnectorEnabled(connector))
diff --git chrome/browser/net/profile_network_context_service.cc chrome/browser/net/profile_network_context_service.cc
index 81851bafbadd5..e0fdb35702b22 100644
index cf11f6a7e1077..dd21d7625c085 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -22,6 +22,7 @@
@ -97,7 +97,7 @@ index fd58815c03393..c3865639affb1 100644
GetInstance()->GetServiceForBrowserContext(profile, true));
}
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index 6564239ce856a..1754df8ad05a9 100644
index d54a6b2b2ef84..6ced1c9fb0750 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -554,6 +554,25 @@ void CookieMonster::SetCookieableSchemes(
@ -127,7 +127,7 @@ index 6564239ce856a..1754df8ad05a9 100644
void CookieMonster::SetPersistSessionCookies(bool persist_session_cookies) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
diff --git net/cookies/cookie_monster.h net/cookies/cookie_monster.h
index 8a896a86b58b0..08077ffeebc3e 100644
index 8c47efddd4a33..cdd8b38e58803 100644
--- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h
@@ -208,6 +208,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@ -178,10 +178,10 @@ index ba7f48e90026c..a509cc4565e9f 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index 02709c1f1bf51..bf9cbcfa3ff48 100644
index 660df7d04bff9..f3cb3381ce462 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2318,16 +2318,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2328,16 +2328,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
}
@ -210,7 +210,7 @@ index 02709c1f1bf51..bf9cbcfa3ff48 100644
base::FeatureList::IsEnabled(features::kFledgePst)) {
trust_token_store_ = std::make_unique<PendingTrustTokenStore>();
diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom
index 62150fda9f17a..14d7b8988e2c9 100644
index e11f45e366c8f..a97152a3f0014 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -357,6 +357,9 @@ struct NetworkContextParams {

10
patch/patches/services_network_2718.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc
index ec5b4bff492cd..9f03c209edbc3 100644
index 3ae0bd0aefe45..0360dfb2079f2 100644
--- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc
@@ -499,10 +499,6 @@ class LoginHandlerDelegate {
@@ -498,10 +498,6 @@ class LoginHandlerDelegate {
}
WebContents* web_contents = web_contents_getter_.Run();
@ -13,7 +13,7 @@ index ec5b4bff492cd..9f03c209edbc3 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true;
@@ -554,12 +550,6 @@ void OnAuthRequiredContinuation(
@@ -553,12 +549,6 @@ void OnAuthRequiredContinuation(
mojo::PendingRemote<network::mojom::AuthChallengeResponder>
auth_challenge_responder,
base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@ -26,7 +26,7 @@ index ec5b4bff492cd..9f03c209edbc3 100644
new LoginHandlerDelegate(
std::move(auth_challenge_responder), std::move(web_contents_getter),
auth_info, is_request_for_primary_main_frame, process_id, request_id, url,
@@ -3075,8 +3065,12 @@ void StoragePartitionImpl::GetQuotaSettings(
@@ -3050,8 +3040,12 @@ void StoragePartitionImpl::GetQuotaSettings(
return;
}
@ -40,7 +40,7 @@ index ec5b4bff492cd..9f03c209edbc3 100644
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
}
@@ -3086,9 +3080,12 @@ void StoragePartitionImpl::InitNetworkContext() {
@@ -3061,9 +3055,12 @@ void StoragePartitionImpl::InitNetworkContext() {
cert_verifier::mojom::CertVerifierCreationParamsPtr
cert_verifier_creation_params =
cert_verifier::mojom::CertVerifierCreationParams::New();

6
patch/patches/set_resize_background_color.patch
View File

@ -1,5 +1,5 @@
diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc
index fd325017d2347..84ab42c78c1fd 100644
index ee170d7984eb3..f45d171d15ea3 100644
--- ui/views/controls/webview/webview.cc
+++ ui/views/controls/webview/webview.cc
@@ -143,6 +143,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
@ -14,10 +14,10 @@ index fd325017d2347..84ab42c78c1fd 100644
if (crashed_overlay_view_ == crashed_overlay_view)
return;
diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h
index 33e93fd257574..b25e00d6b4f48 100644
index 42ccdb874b455..0142d75b381d5 100644
--- ui/views/controls/webview/webview.h
+++ ui/views/controls/webview/webview.h
@@ -85,6 +85,10 @@ class WEBVIEW_EXPORT WebView : public View,
@@ -88,6 +88,10 @@ class WEBVIEW_EXPORT WebView : public View,
void EnableSizingFromWebContents(const gfx::Size& min_size,
const gfx::Size& max_size);

2
patch/patches/trace_event.patch
View File

@ -1,5 +1,5 @@
diff --git base/trace_event/builtin_categories.h base/trace_event/builtin_categories.h
index 3c8faea2c2391..0d744c7b1c27d 100644
index caf0822f9c14c..a052f4265212c 100644
--- base/trace_event/builtin_categories.h
+++ base/trace_event/builtin_categories.h
@@ -63,6 +63,8 @@

22
patch/patches/views_1749_2102_3330.patch
View File

@ -150,7 +150,7 @@ index e641dc163c5fc..785ccd20e4dd4 100644
ImageView* image() const { return image_; }
Label* label() const { return label_; }
diff --git ui/views/controls/label.cc ui/views/controls/label.cc
index 6f46fb17b0916..cd0cfe163acb8 100644
index 8faa59e449ddc..d07df64e9bd8e 100644
--- ui/views/controls/label.cc
+++ ui/views/controls/label.cc
@@ -50,12 +50,29 @@ enum LabelPropertyKey {
@ -199,7 +199,7 @@ index 6f46fb17b0916..cd0cfe163acb8 100644
std::u16string Label::GetTooltipText() const {
return tooltip_text_;
}
@@ -761,6 +787,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
@@ -768,6 +794,16 @@ std::unique_ptr<gfx::RenderText> Label::CreateRenderText() const {
render_text->SelectRange(stored_selection_range_);
}
@ -217,7 +217,7 @@ index 6f46fb17b0916..cd0cfe163acb8 100644
}
diff --git ui/views/controls/label.h ui/views/controls/label.h
index cdaa9899be3e0..40aa6ffcc639a 100644
index 711dc633bffc2..0fa2626150de2 100644
--- ui/views/controls/label.h
+++ ui/views/controls/label.h
@@ -240,6 +240,10 @@ class VIEWS_EXPORT Label : public View,
@ -231,7 +231,7 @@ index cdaa9899be3e0..40aa6ffcc639a 100644
// Gets/Sets the tooltip text. Default behavior for a label (single-line) is
// to show the full text if it is wider than its bounds. Calling this
// overrides the default behavior and lets you set a custom tooltip. To
@@ -499,6 +503,7 @@ class VIEWS_EXPORT Label : public View,
@@ -504,6 +508,7 @@ class VIEWS_EXPORT Label : public View,
int max_width_ = 0;
// This is used in single-line mode.
int max_width_single_line_ = 0;
@ -240,7 +240,7 @@ index cdaa9899be3e0..40aa6ffcc639a 100644
std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index 10044c8def94f..a799a4841e113 100644
index 127c58864174e..156ea7b413541 100644
--- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc
@@ -470,7 +470,8 @@ void MenuController::Run(Widget* parent,
@ -396,10 +396,10 @@ index dac3249c247e5..0573e84ac24a4 100644
explicit MenuHost(SubmenuView* submenu);
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
index 3caeab8d93084..aa7c5541f5e71 100644
index e235da77b57fb..ef0a2d3c3f303 100644
--- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc
@@ -1112,6 +1112,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
@@ -1115,6 +1115,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
spilling_rect.set_y(spilling_rect.y() - corner_radius_);
spilling_rect.set_height(spilling_rect.height() + corner_radius_);
canvas->DrawRoundRect(spilling_rect, corner_radius_, flags);
@ -415,7 +415,7 @@ index 3caeab8d93084..aa7c5541f5e71 100644
} else if (paint_as_selected) {
gfx::Rect item_bounds = GetLocalBounds();
if (type_ == Type::kActionableSubMenu) {
@@ -1178,6 +1187,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
@@ -1182,6 +1191,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
}
SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {
@ -676,7 +676,7 @@ index cf696fbcf0714..5c48fd7410b88 100644
// Hides and cancels the menu.
diff --git ui/views/controls/menu/menu_scroll_view_container.cc ui/views/controls/menu/menu_scroll_view_container.cc
index c4f9cea175824..6ab8c295abf8b 100644
index 76bb4863858fb..feb949470219d 100644
--- ui/views/controls/menu/menu_scroll_view_container.cc
+++ ui/views/controls/menu/menu_scroll_view_container.cc
@@ -257,6 +257,11 @@ MenuScrollViewContainer::MenuScrollViewContainer(SubmenuView* content_view)
@ -692,7 +692,7 @@ index c4f9cea175824..6ab8c295abf8b 100644
content_view_->GetMenuItem()->GetMenuController()->GetAnchorPosition());
diff --git ui/views/test/ui_controls_factory_desktop_aura_ozone.cc ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
index ef7fc4c8d6fc0..88b1b40355a97 100644
index 187e55af5d7be..3a980d26fdaae 100644
--- ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
+++ ui/views/test/ui_controls_factory_desktop_aura_ozone.cc
@@ -15,6 +15,7 @@
@ -703,7 +703,7 @@ index ef7fc4c8d6fc0..88b1b40355a97 100644
#include "ui/aura/client/screen_position_client.h"
#include "ui/aura/env.h"
#include "ui/aura/test/aura_test_utils.h"
@@ -178,9 +179,11 @@ bool SendMouseMoveNotifyWhenDone(int screen_x,
@@ -176,9 +177,11 @@ bool SendMouseMoveNotifyWhenDone(int screen_x,
aura::test::QueryLatestMousePositionRequestInHost(host);
host->ConvertPixelsToDIP(&root_current_location);

16
patch/patches/views_widget.patch
View File

@ -85,7 +85,7 @@ index 7b8afe19a3088..2a2ca57077f73 100644
// renderer process changes. This method is called before notifying
// RenderWidgetHostImpl in order to allow the view to allocate a new
diff --git content/browser/renderer_host/render_widget_host_view_event_handler.cc content/browser/renderer_host/render_widget_host_view_event_handler.cc
index fe52808643114..58197f52e19e5 100644
index bef7961f8b227..72e064659fbda 100644
--- content/browser/renderer_host/render_widget_host_view_event_handler.cc
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
@@ -52,6 +52,10 @@ namespace {
@ -99,7 +99,7 @@ index fe52808643114..58197f52e19e5 100644
#if BUILDFLAG(IS_WIN)
// A callback function for EnumThreadWindows to enumerate and dismiss
// any owned popup windows.
@@ -833,6 +837,14 @@ void RenderWidgetHostViewEventHandler::MoveCursorToCenter(
@@ -862,6 +866,14 @@ void RenderWidgetHostViewEventHandler::MoveCursorToCenter(
}
return;
}
@ -114,7 +114,7 @@ index fe52808643114..58197f52e19e5 100644
#endif
synthetic_move_position_ = center_in_screen;
}
@@ -862,6 +874,17 @@ bool RenderWidgetHostViewEventHandler::MatchesSynthesizedMovePosition(
@@ -891,6 +903,17 @@ bool RenderWidgetHostViewEventHandler::MatchesSynthesizedMovePosition(
}
void RenderWidgetHostViewEventHandler::SetKeyboardFocus() {
@ -243,10 +243,10 @@ index 01d4ffe408a84..fbe41fefbb2bd 100644
base::WeakPtrFactory<DesktopWindowTreeHostLinux> weak_factory_{this};
};
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
index 22487e3d3425f..7bbee50a0fbd9 100644
index d676ba8d52c54..df78950ec1381 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -274,8 +274,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
@@ -280,8 +280,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
if (properties.parent_widget) {
window_parent_ = DesktopWindowTreeHostPlatform::GetHostForWidget(
properties.parent_widget);
@ -359,7 +359,7 @@ index 2e4bacce52a45..76916c5d21cb9 100644
// the implementation of ::ShowCursor() is based on a counter, so making this
// member static ensures that ::ShowCursor() is always called exactly once
diff --git ui/views/widget/widget.cc ui/views/widget/widget.cc
index eb53fdc1b3564..3b6955ebca5ad 100644
index 1f1b98525de2f..053a93a98c909 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -367,7 +367,8 @@ void Widget::Init(InitParams params) {
@ -395,7 +395,7 @@ index eb53fdc1b3564..3b6955ebca5ad 100644
}
if (base::FeatureList::IsEnabled(features::kWidgetLayering)) {
@@ -1615,10 +1624,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
@@ -1621,10 +1630,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
}
gfx::Size Widget::GetMinimumSize() const {
@ -413,7 +413,7 @@ index eb53fdc1b3564..3b6955ebca5ad 100644
}
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index 478b38681cd23..19ec8cc026029 100644
index da0ed1c82d3cf..21cb551cd7852 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -351,6 +351,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,

8
patch/patches/viz_osr_2575.patch
View File

@ -80,10 +80,10 @@ index 8af69cac78b74..9f74e511c263d 100644
private:
const HWND hwnd_;
diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
index f2fe76f53dac7..e7fbe7b38e15d 100644
index 5583233391b21..d02bc281fc96e 100644
--- components/viz/service/BUILD.gn
+++ components/viz/service/BUILD.gn
@@ -224,6 +224,8 @@ viz_component("service") {
@@ -228,6 +228,8 @@ viz_component("service") {
"transitions/transferable_resource_tracker.cc",
"transitions/transferable_resource_tracker.h",
"viz_service_export.h",
@ -150,10 +150,10 @@ index d4d4c1444e7a1..d62a3939a31fa 100644
TRACE_EVENT_ASYNC_BEGIN0("viz", "SoftwareOutputDeviceWinProxy::Draw", this);
diff --git content/browser/compositor/viz_process_transport_factory.cc content/browser/compositor/viz_process_transport_factory.cc
index a45fa7c141777..0cec28b75fcef 100644
index ea2888e6e6ce0..2461e0dcb2038 100644
--- content/browser/compositor/viz_process_transport_factory.cc
+++ content/browser/compositor/viz_process_transport_factory.cc
@@ -397,8 +397,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
@@ -401,8 +401,13 @@ void VizProcessTransportFactory::OnEstablishedGpuChannel(
mojo::AssociatedRemote<viz::mojom::DisplayPrivate> display_private;
root_params->display_private =
display_private.BindNewEndpointAndPassReceiver();

14
patch/patches/web_contents_1257_1565.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc
index e4f917be12064..0c8b367f412d1 100644
index f36fb125659ff..7bd78b680ae4b 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -3207,6 +3207,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3216,6 +3216,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
params.main_frame_name, GetOpener(), primary_main_frame_policy,
base::UnguessableToken::Create());
@ -15,7 +15,7 @@ index e4f917be12064..0c8b367f412d1 100644
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3217,6 +3223,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3226,6 +3232,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
}
@ -23,7 +23,7 @@ index e4f917be12064..0c8b367f412d1 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -3397,6 +3404,9 @@ void WebContentsImpl::RenderWidgetCreated(
@@ -3406,6 +3413,9 @@ void WebContentsImpl::RenderWidgetCreated(
OPTIONAL_TRACE_EVENT1("content", "WebContentsImpl::RenderWidgetCreated",
"render_widget_host", render_widget_host);
created_widgets_.insert(render_widget_host);
@ -33,7 +33,7 @@ index e4f917be12064..0c8b367f412d1 100644
}
void WebContentsImpl::RenderWidgetDeleted(
@@ -4125,6 +4135,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4134,6 +4144,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
create_params.picture_in_picture_options = *(params.pip_options);
}
@ -49,7 +49,7 @@ index e4f917be12064..0c8b367f412d1 100644
// Check whether there is an available prerendered page for this navigation if
// this is not for guest. If it exists, take WebContents pre-created for
// hosting the prerendered page instead of creating new WebContents.
@@ -8046,6 +8065,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -8051,6 +8070,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// frames).
SetFocusedFrameTree(&node->frame_tree());
}
@ -60,7 +60,7 @@ index e4f917be12064..0c8b367f412d1 100644
void WebContentsImpl::DidCallFocus() {
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index 8baf744895c94..305e34f53bf54 100644
index c998b0813ca04..6f8376bfb3ab7 100644
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -96,10 +96,12 @@ class BrowserContext;

4
patch/patches/webkit_plugin_info_2015.patch
View File

@ -1,8 +1,8 @@
diff --git third_party/blink/public/platform/platform.h third_party/blink/public/platform/platform.h
index d7fc9c28b67f0..5a8b5b68654e0 100644
index 1620ec518a7ef..3a636e9298fff 100644
--- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h
@@ -794,6 +794,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -781,6 +781,11 @@ class BLINK_PLATFORM_EXPORT Platform {
}
#endif

14
patch/patches/webkit_popups.patch
View File

@ -1,8 +1,8 @@
diff --git third_party/blink/public/web/web_view.h third_party/blink/public/web/web_view.h
index 2c3930e849719..12c81c7c0e7e6 100644
index 8a18ecf567cd3..9697d43bbbfb9 100644
--- third_party/blink/public/web/web_view.h
+++ third_party/blink/public/web/web_view.h
@@ -342,6 +342,7 @@ class BLINK_EXPORT WebView {
@@ -344,6 +344,7 @@ class BLINK_EXPORT WebView {
// Sets whether select popup menus should be rendered by the browser.
static void SetUseExternalPopupMenus(bool);
@ -11,7 +11,7 @@ index 2c3930e849719..12c81c7c0e7e6 100644
// Cancels and hides the current popup (datetime, select...) if any.
virtual void CancelPagePopup() = 0;
diff --git third_party/blink/renderer/core/exported/web_view_impl.cc third_party/blink/renderer/core/exported/web_view_impl.cc
index 4f99cf1e984cb..7ed63f2db8267 100644
index a1bcdb3b7ceb5..321a5fac3b4e4 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -250,8 +250,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@ -30,7 +30,7 @@ index 4f99cf1e984cb..7ed63f2db8267 100644
}
namespace {
@@ -567,6 +572,7 @@ WebViewImpl::WebViewImpl(
@@ -571,6 +576,7 @@ WebViewImpl::WebViewImpl(
chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)),
minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)),
maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)),
@ -39,10 +39,10 @@ index 4f99cf1e984cb..7ed63f2db8267 100644
fullscreen_controller_(std::make_unique<FullscreenController>(this)),
page_base_background_color_(
diff --git third_party/blink/renderer/core/exported/web_view_impl.h third_party/blink/renderer/core/exported/web_view_impl.h
index 421ca0b15eea5..4802d65c6dc4f 100644
index cce09d720fda1..c723dcdb1ff73 100644
--- third_party/blink/renderer/core/exported/web_view_impl.h
+++ third_party/blink/renderer/core/exported/web_view_impl.h
@@ -135,7 +135,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -137,7 +137,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
static HashSet<WebViewImpl*>& AllInstances();
// Returns true if popup menus should be rendered by the browser, false if
// they should be rendered by WebKit (which is the default).
@ -52,7 +52,7 @@ index 421ca0b15eea5..4802d65c6dc4f 100644
// Returns whether frames under this WebView are backed by a compositor.
bool does_composite() const { return does_composite_; }
@@ -848,6 +849,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
@@ -851,6 +852,8 @@ class CORE_EXPORT WebViewImpl final : public WebView,
float fake_page_scale_animation_page_scale_factor_ = 0.f;
bool fake_page_scale_animation_use_anchor_ = false;

2
patch/patches/webui_2037.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
index 88f0e02ec95c2..8160f40418cc6 100644
index 844803229c2ca..5dde2357e8951 100644
--- chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
+++ chrome/browser/feedback/system_logs/log_sources/chrome_internal_log_source.cc
@@ -19,10 +19,12 @@

4
patch/patches/win_sandbox_3210.patch
View File

@ -1,8 +1,8 @@
diff --git sandbox/policy/win/sandbox_win.cc sandbox/policy/win/sandbox_win.cc
index fe8894d58176f..2235536ae6e03 100644
index 4d566d8c23762..84ac469ac3170 100644
--- sandbox/policy/win/sandbox_win.cc
+++ sandbox/policy/win/sandbox_win.cc
@@ -991,6 +991,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
@@ -967,6 +967,13 @@ ResultCode SandboxWin::StartSandboxedProcess(
const base::HandlesToInheritVector& handles_to_inherit,
SandboxDelegate* delegate,
base::Process* process) {

94
patch/patches/win_sandbox_policy.patch Normal file
View File

@ -0,0 +1,94 @@
diff --git sandbox/win/src/sandbox_policy.h sandbox/win/src/sandbox_policy.h
index 8277058c7e7dc..cf7403c4530df 100644
--- sandbox/win/src/sandbox_policy.h
+++ sandbox/win/src/sandbox_policy.h
@@ -278,7 +278,7 @@ class [[clang::lto_visibility_public]] TargetPolicy {
// Adds a blob of data that will be made available in the child early in
// startup via sandbox::GetDelegateData(). The contents of this data should
// not vary between children with the same TargetConfig().
- virtual void AddDelegateData(base::span<const uint8_t> data) = 0;
+ virtual void AddDelegateData(base::span<uint8_t> data) = 0;
};
} // namespace sandbox
diff --git sandbox/win/src/sandbox_policy_base.cc sandbox/win/src/sandbox_policy_base.cc
index 7a9bdbc017a8d..84cf8055b9d18 100644
--- sandbox/win/src/sandbox_policy_base.cc
+++ sandbox/win/src/sandbox_policy_base.cc
@@ -157,12 +157,12 @@ PolicyGlobal* ConfigBase::policy() {
return policy_;
}
-absl::optional<base::span<const uint8_t>> ConfigBase::policy_span() {
+absl::optional<base::span<uint8_t>> ConfigBase::policy_span() {
if (policy_) {
// Note: this is not policy().data_size as that relates to internal data,
// not the entire allocated policy area.
- return base::span<const uint8_t>(reinterpret_cast<uint8_t*>(policy_.get()),
- kPolMemSize);
+ return base::span<uint8_t>(reinterpret_cast<uint8_t*>(policy_.get()),
+ kPolMemSize);
}
return absl::nullopt;
}
@@ -740,19 +740,19 @@ bool PolicyBase::SetupHandleCloser(TargetProcess& target) {
return handle_closer->InitializeTargetHandles(target);
}
-absl::optional<base::span<const uint8_t>> PolicyBase::delegate_data_span() {
+absl::optional<base::span<uint8_t>> PolicyBase::delegate_data_span() {
if (delegate_data_) {
return base::make_span(*delegate_data_);
}
return absl::nullopt;
}
-void PolicyBase::AddDelegateData(base::span<const uint8_t> data) {
+void PolicyBase::AddDelegateData(base::span<uint8_t> data) {
CHECK(data.size() > 0u);
// Can only set this once - as there is only one region sent to the child.
CHECK(!delegate_data_);
delegate_data_ =
- std::make_unique<std::vector<const uint8_t>>(data.begin(), data.end());
+ std::make_unique<std::vector<uint8_t>>(data.begin(), data.end());
}
} // namespace sandbox
diff --git sandbox/win/src/sandbox_policy_base.h sandbox/win/src/sandbox_policy_base.h
index 23208fa570ce9..811def75d24aa 100644
--- sandbox/win/src/sandbox_policy_base.h
+++ sandbox/win/src/sandbox_policy_base.h
@@ -114,7 +114,7 @@ class ConfigBase final : public TargetConfig {
// Should only be called once the object is configured.
PolicyGlobal* policy();
- absl::optional<base::span<const uint8_t>> policy_span();
+ absl::optional<base::span<uint8_t>> policy_span();
std::vector<std::wstring>& blocklisted_dlls();
AppContainerBase* app_container();
IntegrityLevel integrity_level() { return integrity_level_; }
@@ -172,7 +172,7 @@ class PolicyBase final : public TargetPolicy {
ResultCode SetStdoutHandle(HANDLE handle) override;
ResultCode SetStderrHandle(HANDLE handle) override;
void AddHandleToShare(HANDLE handle) override;
- void AddDelegateData(base::span<const uint8_t> data) override;
+ void AddDelegateData(base::span<uint8_t> data) override;
// Creates a Job object with the level specified in a previous call to
// SetJobLevel().
@@ -234,13 +234,13 @@ class PolicyBase final : public TargetPolicy {
// time.
// Returns nullopt if no data has been set, or a view into the data.
- absl::optional<base::span<const uint8_t>> delegate_data_span();
+ absl::optional<base::span<uint8_t>> delegate_data_span();
// The user-defined global policy settings.
HANDLE stdout_handle_;
HANDLE stderr_handle_;
// An opaque blob of data the delegate uses to prime any pre-sandbox hooks.
- std::unique_ptr<std::vector<const uint8_t>> delegate_data_;
+ std::unique_ptr<std::vector<uint8_t>> delegate_data_;
std::unique_ptr<Dispatcher> dispatcher_;

14
tests/ceftests/permission_prompt_unittest.cc
View File

@ -324,8 +324,10 @@ TEST(PermissionPromptTest, WindowManagementNoGesture) {
// prompts that are blocked.
EXPECT_FALSE(test_setup.got_prompt);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Permission decision deferred.",
test_setup.js_error_str.c_str());
EXPECT_STREQ(
"NotAllowedError: Transient activation is required to request "
"permission.",
test_setup.js_error_str.c_str());
EXPECT_FALSE(test_setup.got_dismiss);
}
@ -425,7 +427,7 @@ TEST(PermissionPromptTest, WindowManagementResultDismiss) {
EXPECT_TRUE(test_setup.got_prompt);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Permission decision deferred.",
EXPECT_STREQ("NotAllowedError: Permission denied.",
test_setup.js_error_str.c_str());
EXPECT_TRUE(test_setup.got_dismiss);
}
@ -443,7 +445,7 @@ TEST(PermissionPromptTest, WindowManagementResultDismissAsync) {
EXPECT_TRUE(test_setup.got_prompt);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Permission decision deferred.",
EXPECT_STREQ("NotAllowedError: Permission denied.",
test_setup.js_error_str.c_str());
EXPECT_TRUE(test_setup.got_dismiss);
}
@ -460,7 +462,7 @@ TEST(PermissionPromptTest, WindowManagementResultIgnore) {
EXPECT_TRUE(test_setup.got_prompt);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Permission decision deferred.",
EXPECT_STREQ("NotAllowedError: Permission denied.",
test_setup.js_error_str.c_str());
EXPECT_TRUE(test_setup.got_dismiss);
}
@ -478,7 +480,7 @@ TEST(PermissionPromptTest, WindowManagementResultIgnoreAsync) {
EXPECT_TRUE(test_setup.got_prompt);
EXPECT_TRUE(test_setup.got_js_error);
EXPECT_STREQ("NotAllowedError: Permission decision deferred.",
EXPECT_STREQ("NotAllowedError: Permission denied.",
test_setup.js_error_str.c_str());
EXPECT_TRUE(test_setup.got_dismiss);
}

2
tools/gn_args.py
View File

@ -550,7 +550,7 @@ def LinuxSysrootExists(cpu):
if cpu == 'x64':
sysroot_name = 'debian_%s_amd64-sysroot' % release
elif cpu == 'arm':
sysroot_name = 'debian_%s_arm-sysroot' % release
sysroot_name = 'debian_%s_armhf-sysroot' % release
elif cpu == 'arm64':
sysroot_name = 'debian_%s_arm64-sysroot' % release
else: