bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 117.0.5895.0 (#1171312)

This commit is contained in:
Marshall Greenblatt 2023-07-20 18:11:34 -04:00
parent 1353677a98
commit 8b46735b79
78 changed files with 489 additions and 476 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

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

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 "515045085896c9e45c1aaf734ee201efad822f6a"
#define CEF_API_HASH_UNIVERSAL "7e96d7c2cfd58a4cf45baac9e75433f3cbb67f63"
#if defined(OS_WIN)
#define CEF_API_HASH_PLATFORM "1091d9b7f17abbbf86cbbf50db7106a2bad98ab5"
#define CEF_API_HASH_PLATFORM "f3a24a5c20d1cbf169ea25398e9186370b6d8de1"
#elif defined(OS_MAC)
#define CEF_API_HASH_PLATFORM "bfb5a9cb4551e80a0606531399e3244eac457a33"
#define CEF_API_HASH_PLATFORM "96a030434c6766961380bb76d92dd59c20ffd2ff"
#elif defined(OS_LINUX)
#define CEF_API_HASH_PLATFORM "1ef1d39d8c95b1d6c93fa60a29e158a96f76ab9d"
#define CEF_API_HASH_PLATFORM "5db43c0641a7a5638de64c9ab3d8807ddf6c9e9c"
#endif
#ifdef __cplusplus

8
include/internal/cef_types.h
View File

@ -3424,11 +3424,9 @@ typedef enum {
CEF_PERMISSION_TYPE_NOTIFICATIONS = 1 << 14,
CEF_PERMISSION_TYPE_PROTECTED_MEDIA_IDENTIFIER = 1 << 15,
CEF_PERMISSION_TYPE_REGISTER_PROTOCOL_HANDLER = 1 << 16,
CEF_PERMISSION_TYPE_SECURITY_ATTESTATION = 1 << 17,
CEF_PERMISSION_TYPE_STORAGE_ACCESS = 1 << 18,
CEF_PERMISSION_TYPE_U2F_API_REQUEST = 1 << 19,
CEF_PERMISSION_TYPE_VR_SESSION = 1 << 20,
CEF_PERMISSION_TYPE_WINDOW_MANAGEMENT = 1 << 21,
CEF_PERMISSION_TYPE_STORAGE_ACCESS = 1 << 17,
CEF_PERMISSION_TYPE_VR_SESSION = 1 << 18,
CEF_PERMISSION_TYPE_WINDOW_MANAGEMENT = 1 << 19,
} cef_permission_request_types_t;
///

7
libcef/browser/alloy/alloy_browser_context.cc
View File

@ -21,7 +21,6 @@
#include "base/logging.h"
#include "base/strings/string_util.h"
#include "chrome/browser/font_family_cache.h"
#include "chrome/browser/media/media_device_id_salt.h"
#include "chrome/browser/permissions/permission_manager_factory.h"
#include "chrome/browser/plugins/chrome_plugin_service_filter.h"
#include "chrome/browser/profiles/profile_key.h"
@ -190,8 +189,6 @@ void AlloyBrowserContext::Initialize() {
}
ChromePluginServiceFilter::GetInstance()->RegisterProfile(this);
media_device_id_salt_ = new MediaDeviceIDSalt(pref_service);
}
void AlloyBrowserContext::Shutdown() {
@ -421,10 +418,6 @@ AlloyBrowserContext::GetReduceAcceptLanguageControllerDelegate() {
return ReduceAcceptLanguageFactory::GetForProfile(this);
}
std::string AlloyBrowserContext::GetMediaDeviceIDSalt() {
return media_device_id_salt_->GetSalt();
}
PrefService* AlloyBrowserContext::GetPrefs() {
return pref_service_.get();
}

4
libcef/browser/alloy/alloy_browser_context.h
View File

@ -18,7 +18,6 @@
class CefDownloadManagerDelegate;
class CefSSLHostStateDelegate;
class CefVisitedLinkListener;
class MediaDeviceIDSalt;
class PrefService;
namespace extensions {
@ -83,7 +82,6 @@ class AlloyBrowserContext : public ChromeProfileAlloy,
override;
content::ReduceAcceptLanguageControllerDelegate*
GetReduceAcceptLanguageControllerDelegate() override;
std::string GetMediaDeviceIDSalt() override;
// Profile overrides.
ChromeZoomLevelPrefs* GetZoomLevelPrefs() override;
@ -146,8 +144,6 @@ class AlloyBrowserContext : public ChromeProfileAlloy,
std::unique_ptr<DownloadPrefs> download_prefs_;
std::unique_ptr<content::ResourceContext> resource_context_;
scoped_refptr<MediaDeviceIDSalt> media_device_id_salt_;
};
#endif // CEF_LIBCEF_BROWSER_ALLOY_ALLOY_BROWSER_CONTEXT_H_

1
libcef/browser/alloy/alloy_browser_main.cc
View File

@ -43,6 +43,7 @@
#include "net/base/net_module.h"
#include "third_party/widevine/cdm/buildflags.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/color/color_provider_manager.h"
#include "ui/native_theme/native_theme.h"
#if BUILDFLAG(IS_LINUX)

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

@ -55,6 +55,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
#include "chrome/browser/extensions/chrome_content_browser_client_extensions_part.h"
#include "chrome/browser/media/webrtc/media_device_salt_service_factory.h"
#include "chrome/browser/net/profile_network_context_service.h"
#include "chrome/browser/net/profile_network_context_service_factory.h"
#include "chrome/browser/net/system_network_context_manager.h"
@ -85,6 +86,7 @@
#include "components/content_settings/core/browser/cookie_settings.h"
#include "components/embedder_support/switches.h"
#include "components/embedder_support/user_agent_utils.h"
#include "components/media_device_salt/media_device_salt_service.h"
#include "components/pdf/browser/pdf_navigation_throttle.h"
#include "components/pdf/browser/pdf_url_loader_request_interceptor.h"
#include "components/pdf/browser/pdf_web_contents_helper.h"
@ -567,8 +569,7 @@ void AlloyContentBrowserClient::AppendExtraCommandLineSwitches(
embedder_support::kUserAgent,
switches::kUserAgentProductAndVersion,
};
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames,
std::size(kSwitchNames));
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames);
}
const std::string& process_type =
@ -586,8 +587,7 @@ void AlloyContentBrowserClient::AppendExtraCommandLineSwitches(
switches::kUncaughtExceptionStackSize,
network::switches::kUnsafelyTreatInsecureOriginAsSecure,
};
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames,
std::size(kSwitchNames));
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames);
if (extensions::ExtensionsEnabled()) {
content::RenderProcessHost* process =
@ -615,8 +615,7 @@ void AlloyContentBrowserClient::AppendExtraCommandLineSwitches(
static const char* const kSwitchNames[] = {
switches::kLang,
};
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames,
std::size(kSwitchNames));
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames);
}
// Necessary to populate DIR_USER_DATA in sub-processes.
@ -642,8 +641,7 @@ void AlloyContentBrowserClient::AppendExtraCommandLineSwitches(
static const char* const kSwitchNames[] = {
switches::kLogFile,
};
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames,
std::size(kSwitchNames));
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames);
}
if (crash_reporting::Enabled()) {
@ -1337,16 +1335,31 @@ AlloyContentBrowserClient::GetPluginMimeTypesWithExternalHandlers(
return mime_types;
}
bool AlloyContentBrowserClient::ArePersistentMediaDeviceIDsAllowed(
content::BrowserContext* browser_context,
const GURL& url,
void AlloyContentBrowserClient::GetMediaDeviceIDSalt(
content::RenderFrameHost* rfh,
const net::SiteForCookies& site_for_cookies,
const absl::optional<url::Origin>& top_frame_origin) {
const blink::StorageKey& storage_key,
base::OnceCallback<void(bool, const std::string&)> callback) {
GURL url = rfh->GetLastCommittedURL();
url::Origin top_frame_origin = rfh->GetMainFrame()->GetLastCommittedOrigin();
content::BrowserContext* browser_context = rfh->GetBrowserContext();
// Persistent MediaDevice IDs are allowed if cookies are allowed.
return CookieSettingsFactory::GetForProfile(
Profile::FromBrowserContext(browser_context))
->IsFullCookieAccessAllowed(url, site_for_cookies, top_frame_origin,
net::CookieSettingOverrides());
scoped_refptr<content_settings::CookieSettings> cookie_settings =
CookieSettingsFactory::GetForProfile(
Profile::FromBrowserContext(browser_context));
bool allowed = cookie_settings->IsFullCookieAccessAllowed(
url, site_for_cookies, top_frame_origin,
cookie_settings->SettingOverridesForStorage());
auto* salt_service =
MediaDeviceSaltServiceFactory::GetInstance()->GetForBrowserContext(
browser_context);
if (!salt_service) {
std::move(callback).Run(allowed, browser_context->UniqueId());
return;
}
salt_service->GetSalt(base::BindOnce(std::move(callback), allowed));
}
void AlloyContentBrowserClient::OnWebContentsCreated(

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

@ -246,11 +246,11 @@ class AlloyContentBrowserClient : public content::ContentBrowserClient {
blink::UserAgentMetadata GetUserAgentMetadata() override;
base::flat_set<std::string> GetPluginMimeTypesWithExternalHandlers(
content::BrowserContext* browser_context) override;
bool ArePersistentMediaDeviceIDsAllowed(
content::BrowserContext* browser_context,
const GURL& scope,
void GetMediaDeviceIDSalt(
content::RenderFrameHost* rfh,
const net::SiteForCookies& site_for_cookies,
const absl::optional<url::Origin>& top_frame_origin) override;
const blink::StorageKey& storage_key,
base::OnceCallback<void(bool, const std::string&)> callback) override;
void OnWebContentsCreated(content::WebContents* web_contents) override;
bool IsFindInPageDisabledForOrigin(const url::Origin& origin) override;

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

@ -421,3 +421,8 @@ HidSystemTrayIcon* ChromeBrowserProcessAlloy::hid_system_tray_icon() {
DCHECK(false);
return nullptr;
}
UsbSystemTrayIcon* ChromeBrowserProcessAlloy::usb_system_tray_icon() {
DCHECK(false);
return nullptr;
}

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

@ -109,6 +109,7 @@ class ChromeBrowserProcessAlloy : public BrowserProcess {
BuildState* GetBuildState() override;
SerialPolicyAllowedPorts* serial_policy_allowed_ports() override;
HidSystemTrayIcon* hid_system_tray_icon() override;
UsbSystemTrayIcon* usb_system_tray_icon() override;
private:
bool initialized_;

2
libcef/browser/browser_context_keyed_service_factories.cc
View File

@ -8,6 +8,7 @@
#include "base/feature_list.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
#include "chrome/browser/media/router/chrome_media_router_factory.h"
#include "chrome/browser/media/webrtc/media_device_salt_service_factory.h"
#include "chrome/browser/plugins/plugin_prefs_factory.h"
#include "chrome/browser/profiles/renderer_updater_factory.h"
#include "chrome/browser/reduce_accept_language/reduce_accept_language_factory.h"
@ -24,6 +25,7 @@ namespace cef {
void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
CookieSettingsFactory::GetInstance();
MediaDeviceSaltServiceFactory::GetInstance();
media_router::ChromeMediaRouterFactory::GetInstance();
PluginPrefsFactory::GetInstance();
PrefsTabHelper::GetServiceInstance();

6
libcef/browser/chrome/chrome_content_browser_client_cef.cc
View File

@ -115,8 +115,7 @@ void ChromeContentBrowserClientCef::AppendExtraCommandLineSwitches(
static const char* const kSwitchNames[] = {
switches::kUserAgentProductAndVersion,
};
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames,
std::size(kSwitchNames));
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames);
}
const std::string& process_type =
@ -127,8 +126,7 @@ void ChromeContentBrowserClientCef::AppendExtraCommandLineSwitches(
static const char* const kSwitchNames[] = {
switches::kUncaughtExceptionStackSize,
};
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames,
std::size(kSwitchNames));
command_line->CopySwitchesFrom(*browser_cmd, kSwitchNames);
}
CefRefPtr<CefApp> app = CefAppManager::Get()->GetApplication();

6
libcef/browser/extensions/extensions_api_client.cc
View File

@ -33,13 +33,11 @@ AppViewGuestDelegate* CefExtensionsAPIClient::CreateAppViewGuestDelegate()
}
std::unique_ptr<guest_view::GuestViewManagerDelegate>
CefExtensionsAPIClient::CreateGuestViewManagerDelegate(
content::BrowserContext* context) const {
CefExtensionsAPIClient::CreateGuestViewManagerDelegate() const {
// The GuestViewManager instance associated with the returned Delegate, which
// will be retrieved in the future via GuestViewManager::FromBrowserContext,
// will be associated with the CefBrowserContext.
return base::WrapUnique(
new extensions::ExtensionsGuestViewManagerDelegate(context));
return base::WrapUnique(new extensions::ExtensionsGuestViewManagerDelegate());
}
std::unique_ptr<MimeHandlerViewGuestDelegate>

3
libcef/browser/extensions/extensions_api_client.h
View File

@ -18,8 +18,7 @@ class CefExtensionsAPIClient : public ExtensionsAPIClient {
// ExtensionsAPIClient implementation.
AppViewGuestDelegate* CreateAppViewGuestDelegate() const override;
std::unique_ptr<guest_view::GuestViewManagerDelegate>
CreateGuestViewManagerDelegate(
content::BrowserContext* context) const override;
CreateGuestViewManagerDelegate() const override;
std::unique_ptr<MimeHandlerViewGuestDelegate>
CreateMimeHandlerViewGuestDelegate(
MimeHandlerViewGuest* guest) const override;

24
libcef/browser/extensions/extensions_browser_client.cc
View File

@ -20,6 +20,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/chrome_url_request_util.h"
#include "chrome/browser/extensions/event_router_forwarder.h"
#include "chrome/browser/media/webrtc/media_device_salt_service_factory.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_frame_host.h"
@ -149,25 +150,21 @@ BrowserContext* CefExtensionsBrowserClient::GetOriginalContext(
}
content::BrowserContext*
CefExtensionsBrowserClient::GetRedirectedContextInIncognito(
CefExtensionsBrowserClient::GetContextRedirectedToOriginal(
content::BrowserContext* context,
bool force_guest_profile,
bool force_system_profile) {
bool force_guest_profile) {
return context;
}
content::BrowserContext*
CefExtensionsBrowserClient::GetContextForRegularAndIncognito(
content::BrowserContext* CefExtensionsBrowserClient::GetContextOwnInstance(
content::BrowserContext* context,
bool force_guest_profile,
bool force_system_profile) {
bool force_guest_profile) {
return context;
}
content::BrowserContext* CefExtensionsBrowserClient::GetRegularProfile(
content::BrowserContext* CefExtensionsBrowserClient::GetContextForOriginalOnly(
content::BrowserContext* context,
bool force_guest_profile,
bool force_system_profile) {
bool force_guest_profile) {
return context;
}
@ -413,4 +410,11 @@ std::string CefExtensionsBrowserClient::GetApplicationLocale() {
return g_browser_process->GetApplicationLocale();
}
media_device_salt::MediaDeviceSaltService*
CefExtensionsBrowserClient::GetMediaDeviceSaltService(
content::BrowserContext* context) {
return MediaDeviceSaltServiceFactory::GetInstance()->GetForBrowserContext(
context);
}
} // namespace extensions

17
libcef/browser/extensions/extensions_browser_client.h
View File

@ -39,18 +39,15 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
content::BrowserContext* context) override;
content::BrowserContext* GetOriginalContext(
content::BrowserContext* context) override;
content::BrowserContext* GetRedirectedContextInIncognito(
content::BrowserContext* GetContextRedirectedToOriginal(
content::BrowserContext* context,
bool force_guest_profile,
bool force_system_profile) override;
content::BrowserContext* GetContextForRegularAndIncognito(
bool force_guest_profile) override;
content::BrowserContext* GetContextOwnInstance(
content::BrowserContext* context,
bool force_guest_profile,
bool force_system_profile) override;
content::BrowserContext* GetRegularProfile(
bool force_guest_profile) override;
content::BrowserContext* GetContextForOriginalOnly(
content::BrowserContext* context,
bool force_guest_profile,
bool force_system_profile) override;
bool force_guest_profile) override;
bool IsGuestSession(content::BrowserContext* context) const override;
bool IsExtensionIncognitoEnabled(
const std::string& extension_id,
@ -118,6 +115,8 @@ class CefExtensionsBrowserClient : public ExtensionsBrowserClient {
KioskDelegate* GetKioskDelegate() override;
bool IsLockScreenContext(content::BrowserContext* context) override;
std::string GetApplicationLocale() override;
media_device_salt::MediaDeviceSaltService* GetMediaDeviceSaltService(
content::BrowserContext* context) override;
private:
// Support for extension APIs.

2
libcef/browser/native/cursor_util_aura.cc
View File

@ -90,7 +90,7 @@ scoped_refptr<ui::PlatformCursor> ToPlatformCursor(
if (ui_cursor.type() == ui::mojom::CursorType::kCustom) {
platform_cursor = ui::CursorFactory::GetInstance()->CreateImageCursor(
ui::mojom::CursorType::kCustom, ui_cursor.custom_bitmap(),
ui_cursor.custom_hotspot());
ui_cursor.custom_hotspot(), ui_cursor.image_scale_factor());
} else {
cursor_loader.SetDisplay(GetDisplay(browser));

1
libcef/browser/osr/host_display_client_osr.cc
View File

@ -9,7 +9,6 @@
#include "libcef/browser/osr/render_widget_host_view_osr.h"
#include "base/memory/shared_memory_mapping.h"
#include "components/viz/common/resources/resource_format.h"
#include "components/viz/common/resources/resource_sizes.h"
#include "mojo/public/cpp/system/platform_handle.h"
#include "services/viz/privileged/mojom/compositing/layered_window_updater.mojom.h"

4
libcef/browser/permission_prompt.cc
View File

@ -213,14 +213,10 @@ cef_permission_request_types_t GetCefRequestType(
#endif
case permissions::RequestType::kRegisterProtocolHandler:
return CEF_PERMISSION_TYPE_REGISTER_PROTOCOL_HANDLER;
case permissions::RequestType::kSecurityAttestation:
return CEF_PERMISSION_TYPE_SECURITY_ATTESTATION;
case permissions::RequestType::kStorageAccess:
return CEF_PERMISSION_TYPE_STORAGE_ACCESS;
case permissions::RequestType::kTopLevelStorageAccess:
return CEF_PERMISSION_TYPE_TOP_LEVEL_STORAGE_ACCESS;
case permissions::RequestType::kU2fApiRequest:
return CEF_PERMISSION_TYPE_U2F_API_REQUEST;
case permissions::RequestType::kVrSession:
return CEF_PERMISSION_TYPE_VR_SESSION;
case permissions::RequestType::kWindowManagement:

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

@ -21,7 +21,6 @@
#include "base/values.h"
#include "chrome/browser/accessibility/accessibility_ui.h"
#include "chrome/browser/download/download_prefs.h"
#include "chrome/browser/media/media_device_id_salt.h"
#include "chrome/browser/media/router/media_router_feature.h"
#include "chrome/browser/media/webrtc/permission_bubble_media_access_handler.h"
#include "chrome/browser/net/profile_network_context_service.h"
@ -46,6 +45,7 @@
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "components/language/core/browser/language_prefs.h"
#include "components/language/core/browser/pref_names.h"
#include "components/media_device_salt/media_device_id_salt.h"
#include "components/permissions/permission_actions_history.h"
#include "components/permissions/permission_hats_trigger_helper.h"
#include "components/policy/core/common/policy_pref_names.h"
@ -269,7 +269,7 @@ std::unique_ptr<PrefService> CreatePrefService(Profile* profile,
HostContentSettingsMap::RegisterProfilePrefs(registry.get());
language::LanguagePrefs::RegisterProfilePrefs(registry.get());
media_router::RegisterProfilePrefs(registry.get());
MediaDeviceIDSalt::RegisterProfilePrefs(registry.get());
media_device_salt::MediaDeviceIDSalt::RegisterProfilePrefs(registry.get());
PermissionBubbleMediaAccessHandler::RegisterProfilePrefs(registry.get());
permissions::PermissionActionsHistory::RegisterProfilePrefs(registry.get());
permissions::PermissionHatsTriggerHelper::RegisterProfilePrefs(

5
libcef/browser/prefs/renderer_prefs.cc
View File

@ -41,7 +41,7 @@
#include "media/media_buildflags.h"
#include "third_party/blink/public/common/peerconnection/webrtc_ip_handling_policy.h"
#include "third_party/blink/public/common/web_preferences/web_preferences.h"
#include "ui/color/color_provider_manager.h"
#include "ui/color/color_provider_key.h"
#include "ui/native_theme/native_theme.h"
namespace renderer_prefs {
@ -219,8 +219,7 @@ bool UpdatePreferredColorScheme(blink::web_pref::WebPreferences* web_prefs,
// WebUI should track the color mode of the ColorProvider associated with
// |web_contents|.
web_prefs->preferred_color_scheme =
web_contents->GetColorMode() ==
ui::ColorProviderManager::ColorMode::kLight
web_contents->GetColorMode() == ui::ColorProviderKey::ColorMode::kLight
? blink::mojom::PreferredColorScheme::kLight
: blink::mojom::PreferredColorScheme::kDark;
}

28
libcef/common/values_impl.cc
View File

@ -791,7 +791,7 @@ bool CefDictionaryValueImpl::Clear() {
bool CefDictionaryValueImpl::HasKey(const CefString& key) {
CEF_VALUE_VERIFY_RETURN(false, 0);
return const_value().GetDict().contains(base::StringPiece(key));
return const_value().GetDict().contains(base::StringPiece(key.ToString()));
}
bool CefDictionaryValueImpl::GetKeys(KeyList& keys) {
@ -813,7 +813,7 @@ CefValueType CefDictionaryValueImpl::GetType(const CefString& key) {
CEF_VALUE_VERIFY_RETURN(false, VTYPE_INVALID);
const base::Value* value =
const_value().GetDict().Find(base::StringPiece(key));
const_value().GetDict().Find(base::StringPiece(key.ToString()));
if (value) {
switch (value->type()) {
case base::Value::Type::NONE:
@ -842,7 +842,7 @@ CefRefPtr<CefValue> CefDictionaryValueImpl::GetValue(const CefString& key) {
CEF_VALUE_VERIFY_RETURN(false, nullptr);
const base::Value* value =
const_value().GetDict().Find(base::StringPiece(key));
const_value().GetDict().Find(base::StringPiece(key.ToString()));
if (value) {
return CefValueImpl::GetOrCreateRefOrCopy(const_cast<base::Value*>(value),
mutable_value_unchecked(),
@ -858,7 +858,7 @@ bool CefDictionaryValueImpl::GetBool(const CefString& key) {
bool ret_value = false;
const base::Value* value =
const_value().GetDict().Find(base::StringPiece(key));
const_value().GetDict().Find(base::StringPiece(key.ToString()));
if (value && value->is_bool()) {
ret_value = value->GetBool();
}
@ -872,7 +872,7 @@ int CefDictionaryValueImpl::GetInt(const CefString& key) {
int ret_value = 0;
const base::Value* value =
const_value().GetDict().Find(base::StringPiece(key));
const_value().GetDict().Find(base::StringPiece(key.ToString()));
if (value && value->is_int()) {
ret_value = value->GetInt();
}
@ -886,7 +886,7 @@ double CefDictionaryValueImpl::GetDouble(const CefString& key) {
double ret_value = 0;
const base::Value* value =
const_value().GetDict().Find(base::StringPiece(key));
const_value().GetDict().Find(base::StringPiece(key.ToString()));
if (value && value->is_double()) {
ret_value = value->GetDouble();
}
@ -900,7 +900,7 @@ CefString CefDictionaryValueImpl::GetString(const CefString& key) {
std::string ret_value;
const base::Value* value =
const_value().GetDict().Find(base::StringPiece(key));
const_value().GetDict().Find(base::StringPiece(key.ToString()));
if (value && value->is_string()) {
ret_value = value->GetString();
}
@ -913,7 +913,7 @@ CefRefPtr<CefBinaryValue> CefDictionaryValueImpl::GetBinary(
CEF_VALUE_VERIFY_RETURN(false, nullptr);
const base::Value* value =
const_value().GetDict().Find(base::StringPiece(key));
const_value().GetDict().Find(base::StringPiece(key.ToString()));
if (value && value->is_blob()) {
base::Value* binary_value = const_cast<base::Value*>(value);
return CefBinaryValueImpl::GetOrCreateRef(
@ -928,7 +928,7 @@ CefRefPtr<CefDictionaryValue> CefDictionaryValueImpl::GetDictionary(
CEF_VALUE_VERIFY_RETURN(false, nullptr);
const base::Value* value =
const_value().GetDict().Find(base::StringPiece(key));
const_value().GetDict().Find(base::StringPiece(key.ToString()));
if (value && value->is_dict()) {
base::Value* dict_value = const_cast<base::Value*>(value);
return CefDictionaryValueImpl::GetOrCreateRef(
@ -942,7 +942,7 @@ CefRefPtr<CefListValue> CefDictionaryValueImpl::GetList(const CefString& key) {
CEF_VALUE_VERIFY_RETURN(false, nullptr);
const base::Value* value =
const_value().GetDict().Find(base::StringPiece(key));
const_value().GetDict().Find(base::StringPiece(key.ToString()));
if (value && value->is_list()) {
base::Value* list_value = const_cast<base::Value*>(value);
return CefListValueImpl::GetOrCreateRef(
@ -1038,14 +1038,14 @@ bool CefDictionaryValueImpl::RemoveInternal(const CefString& key) {
// retrieve the actual Value pointer as it current exists first, for later
// comparison purposes.
const base::Value* actual_value =
const_value().GetDict().Find(base::StringPiece(key));
const_value().GetDict().Find(base::StringPiece(key.ToString()));
if (!actual_value) {
return false;
}
// |actual_value| is no longer valid after this call.
absl::optional<base::Value> out_value =
mutable_value()->GetDict().Extract(base::StringPiece(key));
mutable_value()->GetDict().Extract(base::StringPiece(key.ToString()));
if (!out_value.has_value()) {
return false;
}
@ -1071,8 +1071,8 @@ base::Value* CefDictionaryValueImpl::SetInternal(
// base::Value now uses move semantics which means that Set() will move the
// contents of the passed-in base::Value instead of keeping the same object.
// Set() then returns the actual Value pointer as it currently exists.
base::Value* actual_value =
mutable_value()->GetDict().Set(base::StringPiece(key), std::move(*value));
base::Value* actual_value = mutable_value()->GetDict().Set(
base::StringPiece(key.ToString()), std::move(*value));
CHECK(actual_value);
// |value| will be deleted when this method returns. Update the controller to

2
patch/patches/base_command_line_1872.patch
View File

@ -1,5 +1,5 @@
diff --git base/command_line.cc base/command_line.cc
index 0ff6e0c111e63..543659c662892 100644
index 7e702dcc64a6e..8797d14382e39 100644
--- base/command_line.cc
+++ base/command_line.cc
@@ -346,11 +346,10 @@ void CommandLine::AppendSwitchNative(StringPiece switch_string,

27
patch/patches/base_sandbox_2743.patch
View File

@ -1,5 +1,5 @@
diff --git base/BUILD.gn base/BUILD.gn
index 304223b58a706..67eb34f1f2ebb 100644
index aa7f2d6b3f2ff..439d648f7a7a5 100644
--- base/BUILD.gn
+++ base/BUILD.gn
@@ -40,6 +40,7 @@ import("//build/config/ui.gni")
@ -10,7 +10,7 @@ index 304223b58a706..67eb34f1f2ebb 100644
import("//testing/libfuzzer/fuzzer_test.gni")
import("//testing/test.gni")
@@ -1588,7 +1589,11 @@ component("base") {
@@ -1492,7 +1493,11 @@ component("base") {
"hash/md5_constexpr_internal.h",
"hash/sha1.h",
]
@ -23,7 +23,7 @@ index 304223b58a706..67eb34f1f2ebb 100644
sources += [
"hash/md5_nacl.cc",
"hash/md5_nacl.h",
@@ -1994,6 +1999,12 @@ component("base") {
@@ -1898,6 +1903,12 @@ component("base") {
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
}
@ -112,22 +112,23 @@ index c9dd1249660c1..7d68b0d893e3d 100644
public:
using result_type = uint64_t;
diff --git base/rand_util_win.cc base/rand_util_win.cc
index 2d9a1633b564f..d304c204c43ff 100644
index 549f4362af8b6..f08b1b2e7f061 100644
--- base/rand_util_win.cc
+++ base/rand_util_win.cc
@@ -21,14 +21,19 @@
#include <limits>
@@ -15,8 +15,12 @@
#include "base/check.h"
#include "base/feature_list.h"
+#include "cef/libcef/features/features.h"
+
+#if !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
#include "base/feature_list.h"
#include "third_party/boringssl/src/include/openssl/crypto.h"
#include "third_party/boringssl/src/include/openssl/rand.h"
+#endif
namespace base {
// Prototype for ProcessPrng.
// See: https://learn.microsoft.com/en-us/windows/win32/seccng/processprng
@@ -28,6 +32,7 @@ namespace base {
namespace internal {
@ -135,7 +136,7 @@ index 2d9a1633b564f..d304c204c43ff 100644
namespace {
// The BoringSSl helpers are duplicated in rand_util_fuchsia.cc and
@@ -50,11 +55,16 @@ bool UseBoringSSLForRandBytes() {
@@ -49,6 +54,10 @@ bool UseBoringSSLForRandBytes() {
return g_use_boringssl.load(std::memory_order_relaxed);
}
@ -146,20 +147,22 @@ index 2d9a1633b564f..d304c204c43ff 100644
} // namespace internal
namespace {
@@ -66,6 +75,7 @@ decltype(&ProcessPrng) GetProcessPrng() {
}
void RandBytes(void* output, size_t output_length, bool avoid_allocation) {
+#if !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
// Ensure BoringSSL is initialized so it can use things like RDRAND.
CRYPTO_library_init();
@@ -62,6 +72,7 @@ void RandBytes(void* output, size_t output_length, bool avoid_allocation) {
@@ -73,6 +83,7 @@ void RandBytes(void* output, size_t output_length, bool avoid_allocation) {
(void)RAND_bytes(static_cast<uint8_t*>(output), output_length);
return;
}
+#endif // !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
char* output_ptr = static_cast<char*>(output);
while (output_length > 0) {
static decltype(&ProcessPrng) process_prng_fn = GetProcessPrng();
BOOL success = process_prng_fn(static_cast<BYTE*>(output), output_length);
diff --git base/unguessable_token.cc base/unguessable_token.cc
index aa7423f88d278..1b2c7d3e3c4a0 100644
--- base/unguessable_token.cc

8
patch/patches/browser_security_policy_1081397.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/child_process_security_policy_impl.cc content/browser/child_process_security_policy_impl.cc
index 2bfca65cd8d13..0a5b7a68fca46 100644
index 701cf15750948..7756094d3e341 100644
--- content/browser/child_process_security_policy_impl.cc
+++ content/browser/child_process_security_policy_impl.cc
@@ -1860,6 +1860,16 @@ bool ChildProcessSecurityPolicyImpl::CanAccessDataForMaybeOpaqueOrigin(
@ -20,10 +20,10 @@ index 2bfca65cd8d13..0a5b7a68fca46 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 948ee821dfea0..d63fd2bb9508b 100644
index 2f5bd34117ebb..29fd80e61f399 100644
--- content/browser/renderer_host/navigation_request.cc
+++ content/browser/renderer_host/navigation_request.cc
@@ -7281,10 +7281,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
@@ -7320,10 +7320,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo(
bool use_opaque_origin =
(sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) ==
network::mojom::WebSandboxFlags::kOrigin;
@ -47,7 +47,7 @@ index 948ee821dfea0..d63fd2bb9508b 100644
}
return origin_and_debug_info;
@@ -7314,6 +7326,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() {
@@ -7353,6 +7365,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 d751ddbb3fd58..87941c9f50dac 100644
index 5d5b2c7ffebed..b9ac264ff8094 100644
--- build/config/compiler/BUILD.gn
+++ build/config/compiler/BUILD.gn
@@ -2051,8 +2051,6 @@ config("thin_archive") {
@@ -2044,8 +2044,6 @@ config("thin_archive") {
# confuses lldb.
if ((is_posix && !is_nacl && !is_apple) || is_fuchsia) {
arflags = [ "-T" ]

8
patch/patches/chrome_browser.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn
index c7ff5942d379b..c6d138ad64f95 100644
index dcf3e7327e022..99dd2617e437a 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 c7ff5942d379b..c6d138ad64f95 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/browser/downgrade/buildflags.gni")
import("//chrome/common/features.gni")
@@ -1965,6 +1966,7 @@ static_library("browser") {
@@ -1973,6 +1974,7 @@ static_library("browser") {
"//build/config/chromebox_for_meetings:buildflags",
"//build/config/compiler:compiler_buildflags",
"//cc",
@ -18,7 +18,7 @@ index c7ff5942d379b..c6d138ad64f95 100644
"//chrome:extra_resources",
"//chrome:resources",
"//chrome:strings",
@@ -2556,6 +2558,10 @@ static_library("browser") {
@@ -2568,6 +2570,10 @@ static_library("browser") {
]
}
@ -28,4 +28,4 @@ index c7ff5942d379b..c6d138ad64f95 100644
+
if (is_android) {
sources += [
"after_startup_task_utils_android.cc",
"accessibility/accessibility_prefs/android/accessibility_prefs_controller.cc",

12
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 9c5260579cf05..021b4bc3c5499 100644
index 25a82353eace8..bf3c1cc675688 100644
--- chrome/browser/browser_process.h
+++ chrome/browser/browser_process.h
@@ -202,9 +202,9 @@ class BrowserProcess {
@@ -203,9 +203,9 @@ class BrowserProcess {
virtual DownloadStatusUpdater* download_status_updater() = 0;
virtual DownloadRequestLimiter* download_request_limiter() = 0;
@ -14,10 +14,10 @@ index 9c5260579cf05..021b4bc3c5499 100644
std::unique_ptr<BackgroundModeManager> manager) = 0;
#endif
diff --git chrome/browser/browser_process_impl.cc chrome/browser/browser_process_impl.cc
index 73dc09a7ee5af..f7ab03c788969 100644
index 9e6860e20ed98..130e74f099c83 100644
--- chrome/browser/browser_process_impl.cc
+++ chrome/browser/browser_process_impl.cc
@@ -1032,18 +1032,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 73dc09a7ee5af..f7ab03c788969 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 701b6cc46045c..6ea15c988c15b 100644
index 4a3df6ee2764c..87e12a5e3a6ca 100644
--- chrome/browser/browser_process_impl.h
+++ chrome/browser/browser_process_impl.h
@@ -184,8 +184,8 @@ class BrowserProcessImpl : public BrowserProcess,
@@ -185,8 +185,8 @@ class BrowserProcessImpl : public BrowserProcess,
void SetApplicationLocale(const std::string& actual_locale) override;
DownloadStatusUpdater* download_status_updater() override;
DownloadRequestLimiter* download_request_limiter() override;

22
patch/patches/chrome_browser_browser.patch
View File

@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644
return false;
}
diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn
index 16bf45bea457e..d9db045e7bd68 100644
index c2b27aea9b244..021203f3a67cc 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 16bf45bea457e..d9db045e7bd68 100644
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//chromeos/ash/components/assistant/assistant.gni")
@@ -478,6 +479,10 @@ static_library("ui") {
@@ -376,6 +377,10 @@ static_library("ui") {
"//build/config/compiler:wexit_time_destructors",
]
@ -35,7 +35,7 @@ index 16bf45bea457e..d9db045e7bd68 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
@@ -502,6 +507,7 @@ static_library("ui") {
@@ -400,6 +405,7 @@ static_library("ui") {
"//build:chromeos_buildflags",
"//build/config/chromebox_for_meetings:buildflags",
"//cc/paint",
@ -43,7 +43,7 @@ index 16bf45bea457e..d9db045e7bd68 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/app:chrome_dll_resources",
@@ -2726,6 +2732,8 @@ static_library("ui") {
@@ -2646,6 +2652,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 16bf45bea457e..d9db045e7bd68 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",
@@ -4528,8 +4536,6 @@ static_library("ui") {
@@ -4524,8 +4532,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 16bf45bea457e..d9db045e7bd68 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",
@@ -6135,6 +6141,7 @@ static_library("ui") {
@@ -6165,6 +6171,7 @@ static_library("ui") {
if (enable_printing) {
deps += [
"//components/printing/browser",
@ -308,7 +308,7 @@ index 9125b6d7e3e87..9140a9cf4ca7d 100644
void Browser::TabDetachedAtImpl(content::WebContents* contents,
diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h
index 2cbbda0614965..976a9e8be44b6 100644
index b0fdd85964754..f86896354ec6f 100644
--- chrome/browser/ui/browser.h
+++ chrome/browser/ui/browser.h
@@ -22,6 +22,7 @@
@ -356,7 +356,7 @@ index 2cbbda0614965..976a9e8be44b6 100644
// Accessors ////////////////////////////////////////////////////////////////
const CreateParams& create_params() const { return create_params_; }
@@ -474,6 +491,12 @@ class Browser : public TabStripModelObserver,
@@ -472,6 +489,12 @@ class Browser : public TabStripModelObserver,
base::WeakPtr<Browser> AsWeakPtr();
@ -369,7 +369,7 @@ index 2cbbda0614965..976a9e8be44b6 100644
// Get the FindBarController for this browser, creating it if it does not
// yet exist.
FindBarController* GetFindBarController();
@@ -850,11 +873,19 @@ class Browser : public TabStripModelObserver,
@@ -867,11 +890,19 @@ class Browser : public TabStripModelObserver,
void SetContentsBounds(content::WebContents* source,
const gfx::Rect& bounds) override;
void UpdateTargetURL(content::WebContents* source, const GURL& url) override;
@ -389,7 +389,7 @@ index 2cbbda0614965..976a9e8be44b6 100644
void BeforeUnloadFired(content::WebContents* source,
bool proceed,
bool* proceed_to_fire_unload) override;
@@ -1266,6 +1297,8 @@ class Browser : public TabStripModelObserver,
@@ -1279,6 +1310,8 @@ class Browser : public TabStripModelObserver,
const std::string initial_workspace_;
bool initial_visible_on_all_workspaces_state_;
@ -398,7 +398,7 @@ index 2cbbda0614965..976a9e8be44b6 100644
CreationSource creation_source_ = CreationSource::kUnknown;
UnloadController unload_controller_;
@@ -1330,6 +1363,10 @@ class Browser : public TabStripModelObserver,
@@ -1343,6 +1376,10 @@ class Browser : public TabStripModelObserver,
extension_browser_window_helper_;
#endif

22
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 2ab92db1a1136..dc9f25b79f3bd 100644
index bb4d4e74f20d5..72bb071a6a4b5 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.cc
+++ chrome/browser/renderer_context_menu/render_view_context_menu.cc
@@ -330,6 +330,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
@@ -333,6 +333,13 @@ base::OnceCallback<void(RenderViewContextMenu*)>* GetMenuShownCallback() {
return callback.get();
}
@ -16,7 +16,7 @@ index 2ab92db1a1136..dc9f25b79f3bd 100644
enum class UmaEnumIdLookupType {
GeneralEnumId,
ContextSpecificEnumId,
@@ -577,6 +584,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
@@ -584,6 +591,10 @@ int FindUMAEnumValueForCommand(int id, UmaEnumIdLookupType type) {
if (ContextMenuMatcher::IsExtensionsCustomCommandId(id))
return 1;
@ -27,7 +27,7 @@ index 2ab92db1a1136..dc9f25b79f3bd 100644
id = CollapseCommandsForUMA(id);
const auto& map = GetIdcToUmaMap(type);
auto it = map.find(id);
@@ -824,6 +835,14 @@ RenderViewContextMenu::RenderViewContextMenu(
@@ -812,6 +823,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 2ab92db1a1136..dc9f25b79f3bd 100644
}
RenderViewContextMenu::~RenderViewContextMenu() = default;
@@ -1260,6 +1279,12 @@ void RenderViewContextMenu::InitMenu() {
@@ -1244,6 +1263,12 @@ void RenderViewContextMenu::InitMenu() {
autofill::PopupHidingReason::kContextMenuOpened);
}
}
@ -55,7 +55,7 @@ index 2ab92db1a1136..dc9f25b79f3bd 100644
}
Profile* RenderViewContextMenu::GetProfile() const {
@@ -3281,6 +3306,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
@@ -3282,6 +3307,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting(
execute_plugin_action_callback_ = std::move(cb);
}
@ -69,10 +69,10 @@ index 2ab92db1a1136..dc9f25b79f3bd 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 0cbc7b7181130..8346c35242724 100644
index 13d339371eb18..0be7773301641 100644
--- chrome/browser/renderer_context_menu/render_view_context_menu.h
+++ chrome/browser/renderer_context_menu/render_view_context_menu.h
@@ -146,6 +146,12 @@ class RenderViewContextMenu
@@ -152,6 +152,12 @@ class RenderViewContextMenu
}
#endif
@ -85,7 +85,7 @@ index 0cbc7b7181130..8346c35242724 100644
protected:
Profile* GetProfile() const;
@@ -415,6 +421,9 @@ class RenderViewContextMenu
@@ -429,6 +435,9 @@ class RenderViewContextMenu
// built.
bool is_protocol_submenu_valid_ = false;
@ -96,7 +96,7 @@ index 0cbc7b7181130..8346c35242724 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 357a070bcb8e4..f4346b8daa51a 100644
index 18283c801689e..9838c25d6e584 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 75986f68d98b4..5c51500093c1a 100644
index b1e2fd00dc0db..aa05ffd7b93c2 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,

38
patch/patches/chrome_browser_dialogs_native.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/file_select_helper.cc chrome/browser/file_select_helper.cc
index 1ee6c28cd47bc..62fd628dffd07 100644
index 3d1c3d62953cf..b352990508904 100644
--- chrome/browser/file_select_helper.cc
+++ chrome/browser/file_select_helper.cc
@@ -20,6 +20,7 @@
@ -10,7 +10,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/common.h"
#include "chrome/browser/platform_util.h"
@@ -250,6 +251,13 @@ void FileSelectHelper::OnListFile(
@@ -251,6 +252,13 @@ void FileSelectHelper::OnListFile(
void FileSelectHelper::LaunchConfirmationDialog(
const base::FilePath& path,
std::vector<ui::SelectedFileInfo> selected_files) {
@ -24,7 +24,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
ShowFolderUploadConfirmationDialog(
path,
base::BindOnce(&FileSelectHelper::ConvertToFileChooserFileInfoList, this),
@@ -334,6 +342,12 @@ void FileSelectHelper::PerformContentAnalysisIfNeeded(
@@ -335,6 +343,12 @@ void FileSelectHelper::PerformContentAnalysisIfNeeded(
if (AbortIfWebContentsDestroyed())
return;
@ -34,10 +34,10 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
+ return;
+ }
+
#if BUILDFLAG(FULL_SAFE_BROWSING)
#if BUILDFLAG(ENTERPRISE_CLOUD_CONTENT_ANALYSIS)
enterprise_connectors::ContentAnalysisDelegate::Data data;
if (enterprise_connectors::ContentAnalysisDelegate::IsEnabled(
@@ -522,7 +536,8 @@ bool FileSelectHelper::IsDirectoryEnumerationStartedForTesting() {
@@ -463,7 +477,8 @@ void FileSelectHelper::DontAbortOnMissingWebContentsForTesting() {
std::unique_ptr<ui::SelectFileDialog::FileTypeInfo>
FileSelectHelper::GetFileTypesFromAcceptType(
@ -47,7 +47,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
auto base_file_type = std::make_unique<ui::SelectFileDialog::FileTypeInfo>();
if (accept_types.empty())
return base_file_type;
@@ -535,17 +550,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -476,17 +491,24 @@ FileSelectHelper::GetFileTypesFromAcceptType(
std::vector<base::FilePath::StringType>* extensions =
&file_type->extensions.back();
@ -73,7 +73,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
} else {
if (!base::IsStringASCII(accept_type))
continue;
@@ -556,10 +578,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -497,10 +519,18 @@ FileSelectHelper::GetFileTypesFromAcceptType(
description_id = IDS_AUDIO_FILES;
else if (ascii_type == "video/*")
description_id = IDS_VIDEO_FILES;
@ -94,7 +94,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
if (extensions->size() > old_extension_size)
valid_type_count++;
}
@@ -584,6 +614,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -525,6 +555,15 @@ FileSelectHelper::GetFileTypesFromAcceptType(
l10n_util::GetStringUTF16(description_id));
}
@ -110,7 +110,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
return file_type;
}
@@ -591,7 +630,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
@@ -532,7 +571,8 @@ FileSelectHelper::GetFileTypesFromAcceptType(
void FileSelectHelper::RunFileChooser(
content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener,
@ -120,7 +120,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
Profile* profile = Profile::FromBrowserContext(
render_frame_host->GetProcess()->GetBrowserContext());
@@ -610,6 +650,7 @@ void FileSelectHelper::RunFileChooser(
@@ -551,6 +591,7 @@ void FileSelectHelper::RunFileChooser(
// message.
scoped_refptr<FileSelectHelper> file_select_helper(
new FileSelectHelper(profile));
@ -128,7 +128,7 @@ index 1ee6c28cd47bc..62fd628dffd07 100644
file_select_helper->RunFileChooser(render_frame_host, std::move(listener),
params.Clone());
}
@@ -661,7 +702,8 @@ void FileSelectHelper::RunFileChooser(
@@ -602,7 +643,8 @@ void FileSelectHelper::RunFileChooser(
}
void FileSelectHelper::GetFileTypesInThreadPool(FileChooserParamsPtr params) {
@ -139,10 +139,10 @@ 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 e3a85080fd37d..2f3e8e64614d7 100644
index 143b971ea541e..a45df89a843b0 100644
--- chrome/browser/file_select_helper.h
+++ chrome/browser/file_select_helper.h
@@ -61,7 +61,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
@@ -62,7 +62,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
static void RunFileChooser(
content::RenderFrameHost* render_frame_host,
scoped_refptr<content::FileSelectListener> listener,
@ -152,7 +152,7 @@ index e3a85080fd37d..2f3e8e64614d7 100644
// Enumerates all the files in directory.
static void EnumerateDirectory(
@@ -288,7 +289,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
@@ -268,7 +269,8 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
// |accept_types| contains only valid lowercased MIME types or file extensions
// beginning with a period (.).
static std::unique_ptr<ui::SelectFileDialog::FileTypeInfo>
@ -162,7 +162,7 @@ index e3a85080fd37d..2f3e8e64614d7 100644
// Check the accept type is valid. It is expected to be all lower case with
// no whitespace.
@@ -349,6 +351,9 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
@@ -329,6 +331,9 @@ class FileSelectHelper : public base::RefCountedThreadSafe<
// Set to false in unit tests since there is no WebContents.
bool abort_on_missing_web_contents_in_tests_ = true;
@ -173,7 +173,7 @@ index e3a85080fd37d..2f3e8e64614d7 100644
base::WeakPtrFactory<FileSelectHelper> weak_ptr_factory_{this};
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
diff --git chrome/browser/ui/chrome_select_file_policy.h chrome/browser/ui/chrome_select_file_policy.h
index 026f8ae631697..45b324fd3ae25 100644
index 6e85ac927afc4..41cf347a7a2e1 100644
--- chrome/browser/ui/chrome_select_file_policy.h
+++ chrome/browser/ui/chrome_select_file_policy.h
@@ -30,6 +30,8 @@ class ChromeSelectFilePolicy : public ui::SelectFilePolicy {
@ -183,7 +183,7 @@ index 026f8ae631697..45b324fd3ae25 100644
+ content::WebContents* source_contents() const { return source_contents_; }
+
private:
raw_ptr<content::WebContents, DanglingUntriaged> source_contents_;
raw_ptr<content::WebContents, DanglingAcrossTasks> source_contents_;
};
diff --git ui/shell_dialogs/execute_select_file_win.cc ui/shell_dialogs/execute_select_file_win.cc
index 101e91826023b..35456ffad43f3 100644
@ -255,7 +255,7 @@ index e2c00b2ec1532..a2e8753766597 100644
return CreateSelectFileDialog(listener, std::move(policy));
}
diff --git ui/shell_dialogs/select_file_dialog.h ui/shell_dialogs/select_file_dialog.h
index 3f1db1a9c6fd3..1f0e4af378c78 100644
index b27b152cf8843..765abdf241fca 100644
--- ui/shell_dialogs/select_file_dialog.h
+++ ui/shell_dialogs/select_file_dialog.h
@@ -114,7 +114,8 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
@ -290,7 +290,7 @@ index 3f1db1a9c6fd3..1f0e4af378c78 100644
@@ -236,6 +250,11 @@ class SHELL_DIALOGS_EXPORT SelectFileDialog
// The listener to be notified of selection completion.
raw_ptr<Listener, DanglingUntriaged> listener_;
raw_ptr<Listener, DanglingAcrossTasks> listener_;
+ std::unique_ptr<SelectFilePolicy> select_file_policy_;
+

12
patch/patches/chrome_browser_dialogs_widget.patch
View File

@ -120,10 +120,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 f8534ef8ee922..ca0c139d7ef1e 100644
index cd6fa368d3960..3a1f64fd295c7 100644
--- ui/views/window/dialog_delegate.cc
+++ ui/views/window/dialog_delegate.cc
@@ -53,10 +53,12 @@ DialogDelegate::DialogDelegate() {
@@ -64,10 +64,12 @@ DialogDelegate::DialogDelegate() {
// static
Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
gfx::NativeWindow context,
@ -138,7 +138,7 @@ index f8534ef8ee922..ca0c139d7ef1e 100644
widget->Init(std::move(params));
return widget;
}
@@ -65,17 +67,19 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
@@ -76,17 +78,19 @@ Widget* DialogDelegate::CreateDialogWidget(WidgetDelegate* delegate,
Widget* DialogDelegate::CreateDialogWidget(
std::unique_ptr<WidgetDelegate> delegate,
gfx::NativeWindow context,
@ -162,7 +162,7 @@ index f8534ef8ee922..ca0c139d7ef1e 100644
#else
return true;
#endif
@@ -86,14 +90,15 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
@@ -97,14 +101,15 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
WidgetDelegate* delegate,
gfx::NativeWindow context,
gfx::NativeView parent,
@ -180,7 +180,7 @@ index f8534ef8ee922..ca0c139d7ef1e 100644
if (!dialog || dialog->use_custom_frame()) {
params.opacity = Widget::InitParams::WindowOpacity::kTranslucent;
@@ -106,6 +111,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
@@ -117,6 +122,7 @@ Widget::InitParams DialogDelegate::GetDialogWidgetInitParams(
}
params.context = context;
params.parent = parent;
@ -189,7 +189,7 @@ index f8534ef8ee922..ca0c139d7ef1e 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 ca8ef29878e8e..90b845c480505 100644
index 4d64cf4f40af7..1d77b1c152253 100644
--- ui/views/window/dialog_delegate.h
+++ ui/views/window/dialog_delegate.h
@@ -97,13 +97,18 @@ class VIEWS_EXPORT DialogDelegate : public WidgetDelegate {

4
patch/patches/chrome_browser_extensions.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/extensions/api/chrome_extensions_api_client.cc chrome/browser/extensions/api/chrome_extensions_api_client.cc
index 76cfedc631be6..7b04f6ef7353b 100644
index 399d2720023c5..32755b74185cb 100644
--- chrome/browser/extensions/api/chrome_extensions_api_client.cc
+++ chrome/browser/extensions/api/chrome_extensions_api_client.cc
@@ -13,6 +13,7 @@
@ -21,7 +21,7 @@ index 76cfedc631be6..7b04f6ef7353b 100644
#if BUILDFLAG(ENABLE_PDF)
#include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h"
#include "components/pdf/browser/pdf_web_contents_helper.h"
@@ -307,6 +312,11 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate(
@@ -306,6 +311,11 @@ ChromeExtensionsAPIClient::CreateGuestViewManagerDelegate() const {
std::unique_ptr<MimeHandlerViewGuestDelegate>
ChromeExtensionsAPIClient::CreateMimeHandlerViewGuestDelegate(
MimeHandlerViewGuest* guest) const {

18
patch/patches/chrome_browser_frame_mac.patch
View File

@ -1,16 +1,16 @@
diff --git chrome/browser/ui/views/frame/browser_frame_mac.h chrome/browser/ui/views/frame/browser_frame_mac.h
index ab1d8fd9bfa84..77f65b44e591a 100644
index 986c2b47ee1f4..c3b6806e0c20a 100644
--- chrome/browser/ui/views/frame/browser_frame_mac.h
+++ chrome/browser/ui/views/frame/browser_frame_mac.h
@@ -12,6 +12,7 @@
#include "chrome/browser/command_observer.h"
#include "ui/views/widget/native_widget_mac.h"
@@ -15,6 +15,7 @@
#error "This file requires ARC support."
#endif
+class Browser;
class BrowserFrame;
class BrowserView;
@class BrowserWindowTouchBarController;
@@ -55,6 +56,21 @@ class BrowserFrameMac : public views::NativeWidgetMac,
@@ -58,6 +59,21 @@ class BrowserFrameMac : public views::NativeWidgetMac,
bool ShouldUseInitialVisibleOnAllWorkspaces() const override;
void AnnounceTextInInProcessWindow(const std::u16string& text) override;
@ -33,10 +33,10 @@ 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 55f9663efa82a..d0fabd2273a80 100644
index ef5f9343dc024..60cf660a8e63c 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() {
@@ -185,7 +185,14 @@ void BrowserFrameMac::OnWindowFullscreenTransitionComplete() {
void BrowserFrameMac::ValidateUserInterfaceItem(
int32_t tag,
remote_cocoa::mojom::ValidateUserInterfaceItemResult* result) {
@ -52,7 +52,7 @@ index 55f9663efa82a..d0fabd2273a80 100644
if (!chrome::SupportsCommand(browser, tag)) {
result->enable = false;
return;
@@ -309,8 +316,16 @@ bool BrowserFrameMac::WillExecuteCommand(
@@ -313,8 +320,16 @@ bool BrowserFrameMac::WillExecuteCommand(
int32_t command,
WindowOpenDisposition window_open_disposition,
bool is_before_first_responder) {
@ -70,7 +70,7 @@ index 55f9663efa82a..d0fabd2273a80 100644
if (is_before_first_responder) {
// The specification for this private extensions API is incredibly vague.
// For now, we avoid triggering chrome commands prior to giving the
@@ -341,11 +356,20 @@ bool BrowserFrameMac::ExecuteCommand(
@@ -345,11 +360,20 @@ bool BrowserFrameMac::ExecuteCommand(
int32_t command,
WindowOpenDisposition window_open_disposition,
bool is_before_first_responder) {

6
patch/patches/chrome_browser_net_proxy.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/net/proxy_config_monitor.cc chrome/browser/net/proxy_config_monitor.cc
index 6dc5622f50847..89d36c8485e7e 100644
index c9281f7abfbde..a1b7c77475b54 100644
--- chrome/browser/net/proxy_config_monitor.cc
+++ chrome/browser/net/proxy_config_monitor.cc
@@ -9,6 +9,7 @@
@ -10,7 +10,7 @@ index 6dc5622f50847..89d36c8485e7e 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/net/proxy_service_factory.h"
#include "chrome/browser/profiles/profile.h"
@@ -22,6 +23,10 @@
@@ -21,6 +22,10 @@
#include "chrome/browser/ash/profiles/profile_helper.h"
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -21,7 +21,7 @@ index 6dc5622f50847..89d36c8485e7e 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/extensions/api/proxy/proxy_api.h"
#endif
@@ -95,6 +100,9 @@ void ProxyConfigMonitor::AddToNetworkContextParams(
@@ -92,6 +97,9 @@ void ProxyConfigMonitor::AddToNetworkContextParams(
}
#if BUILDFLAG(ENABLE_EXTENSIONS)

10
patch/patches/chrome_browser_permission_prompt.patch
View File

@ -77,7 +77,7 @@ index 18e2eec8f64ff..d36b3206aeb63 100644
}
diff --git chrome/browser/permissions/permission_manager_factory.cc chrome/browser/permissions/permission_manager_factory.cc
index bac111192fab1..695c240875c31 100644
index 0a357c35588fb..cb82d52628d64 100644
--- chrome/browser/permissions/permission_manager_factory.cc
+++ chrome/browser/permissions/permission_manager_factory.cc
@@ -6,6 +6,7 @@
@ -174,7 +174,7 @@ index 82a50b7e22dfe..c4ba55ec6bd54 100644
if (!browser) {
DLOG(WARNING) << "Permission prompt suppressed because the WebContents is "
diff --git components/embedder_support/permission_context_utils.cc components/embedder_support/permission_context_utils.cc
index ff8391841fc28..08562a3a03aef 100644
index 07f3c7c86b22d..110e48d59a75a 100644
--- components/embedder_support/permission_context_utils.cc
+++ components/embedder_support/permission_context_utils.cc
@@ -5,6 +5,7 @@
@ -185,9 +185,9 @@ index ff8391841fc28..08562a3a03aef 100644
#include "components/background_sync/background_sync_permission_context.h"
#include "components/permissions/contexts/accessibility_permission_context.h"
#include "components/permissions/contexts/camera_pan_tilt_zoom_permission_context.h"
@@ -75,12 +76,19 @@ CreateDefaultPermissionContexts(content::BrowserContext* browser_context,
browser_context,
std::move(delegates.geolocation_permission_context_delegate));
@@ -77,12 +78,19 @@ CreateDefaultPermissionContexts(content::BrowserContext* browser_context,
std::move(delegates.geolocation_permission_context_delegate),
is_regular_profile);
#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
+ if (cef::IsAlloyRuntimeEnabled()) {
+ permission_contexts[ContentSettingsType::GEOLOCATION] =

8
patch/patches/chrome_browser_profiles.patch
View File

@ -84,10 +84,10 @@ index 946b9cb533714..80815f7feb8f8 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 a3ee1846fcf77..13edaf1203d69 100644
index 5320b192eca93..cba2c8b7c461b 100644
--- chrome/browser/profiles/profile_impl.cc
+++ chrome/browser/profiles/profile_impl.cc
@@ -1031,7 +1031,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
@@ -1026,7 +1026,9 @@ Profile* ProfileImpl::GetOffTheRecordProfile(const OTRProfileID& otr_profile_id,
otr_profiles_[otr_profile_id] = std::move(otr_profile);
@ -99,7 +99,7 @@ index a3ee1846fcf77..13edaf1203d69 100644
return raw_otr_profile;
}
diff --git chrome/browser/profiles/profile_manager.cc chrome/browser/profiles/profile_manager.cc
index 92dec1c25477c..0723bdb6bc6ad 100644
index fe2703aaa7a28..25bd6d48fcf3a 100644
--- chrome/browser/profiles/profile_manager.cc
+++ chrome/browser/profiles/profile_manager.cc
@@ -389,7 +389,7 @@ ProfileManager::ProfileManager(const base::FilePath& user_data_dir)
@ -112,7 +112,7 @@ index 92dec1c25477c..0723bdb6bc6ad 100644
zombie_metrics_timer_.Start(FROM_HERE, base::Minutes(30), this,
diff --git chrome/browser/profiles/profile_manager.h chrome/browser/profiles/profile_manager.h
index 60c9fd19fe15b..2a3e317d9c240 100644
index 9bb7cd968c95d..bf16634f7dfe8 100644
--- chrome/browser/profiles/profile_manager.h
+++ chrome/browser/profiles/profile_manager.h
@@ -130,7 +130,7 @@ class ProfileManager : public Profile::Delegate {

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 d0d299f92a292..3bee2edbcd073 100644
index 3200f0693c937..6343f021ab599 100644
--- chrome/browser/safe_browsing/BUILD.gn
+++ chrome/browser/safe_browsing/BUILD.gn
@@ -32,6 +32,7 @@ static_library("safe_browsing") {

4
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 b8cfd5d2daa3b..51b52a3f34409 100644
index 3029367684e02..ed21af366e98f 100644
--- chrome/browser/themes/theme_service.cc
+++ chrome/browser/themes/theme_service.cc
@@ -30,6 +30,7 @@
@ -42,7 +42,7 @@ index b8cfd5d2daa3b..51b52a3f34409 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 ebf3978910959..af00465d254a1 100644
index f5cd806c72a1d..3367398e7025c 100644
--- chrome/browser/themes/theme_service_factory.cc
+++ chrome/browser/themes/theme_service_factory.cc
@@ -9,6 +9,7 @@

10
patch/patches/chrome_plugins.patch
View File

@ -42,10 +42,10 @@ index 438276b719c2f..69635e429be78 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 43fc365662842..8aa6804c98fe1 100644
index 51e79ffb4cf1c..7b101f5ee4d56 100644
--- chrome/renderer/chrome_content_renderer_client.cc
+++ chrome/renderer/chrome_content_renderer_client.cc
@@ -984,6 +984,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -970,6 +970,7 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
if ((status == chrome::mojom::PluginStatus::kUnauthorized ||
status == chrome::mojom::PluginStatus::kBlocked) &&
@ -53,7 +53,7 @@ index 43fc365662842..8aa6804c98fe1 100644
content_settings_agent_delegate->IsPluginTemporarilyAllowed(
identifier)) {
status = chrome::mojom::PluginStatus::kAllowed;
@@ -1141,7 +1142,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1132,7 +1133,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
render_frame->GetRemoteAssociatedInterfaces()->GetInterface(
plugin_auth_host.BindNewEndpointAndPassReceiver());
plugin_auth_host->BlockedUnauthorizedPlugin(group_name, identifier);
@ -63,7 +63,7 @@ index 43fc365662842..8aa6804c98fe1 100644
break;
}
case chrome::mojom::PluginStatus::kBlocked: {
@@ -1150,7 +1152,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1141,7 +1143,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 43fc365662842..8aa6804c98fe1 100644
break;
}
case chrome::mojom::PluginStatus::kBlockedByPolicy: {
@@ -1160,7 +1163,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
@@ -1151,7 +1154,8 @@ WebPlugin* ChromeContentRendererClient::CreatePlugin(
group_name));
RenderThread::Get()->RecordAction(
UserMetricsAction("Plugin_BlockedByPolicy"));

4
patch/patches/chrome_renderer.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/renderer/BUILD.gn chrome/renderer/BUILD.gn
index 75bb3119411d2..462fa070d07a8 100644
index 7d38a8100bff2..8b2f259b9039e 100644
--- chrome/renderer/BUILD.gn
+++ chrome/renderer/BUILD.gn
@@ -5,6 +5,7 @@
@ -18,7 +18,7 @@ index 75bb3119411d2..462fa070d07a8 100644
"//chrome:resources",
"//chrome:strings",
"//chrome/common",
@@ -237,6 +239,10 @@ static_library("renderer") {
@@ -236,6 +238,10 @@ static_library("renderer") {
configs += [ "//build/config/compiler:wexit_time_destructors" ]

70
patch/patches/chrome_runtime.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/app/chrome_main_delegate.cc chrome/app/chrome_main_delegate.cc
index 3a1539905f1fb..84071f39325a2 100644
index 306634c473672..008ed0b1eca39 100644
--- chrome/app/chrome_main_delegate.cc
+++ chrome/app/chrome_main_delegate.cc
@@ -40,6 +40,7 @@
@ -10,7 +10,7 @@ index 3a1539905f1fb..84071f39325a2 100644
#include "chrome/browser/buildflags.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chrome_resource_bundle_helper.h"
@@ -504,6 +505,8 @@ struct MainFunction {
@@ -519,6 +520,8 @@ struct MainFunction {
// Initializes the user data dir. Must be called before InitializeLocalState().
void InitializeUserDataDir(base::CommandLine* command_line) {
@ -19,7 +19,7 @@ index 3a1539905f1fb..84071f39325a2 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.
@@ -653,6 +656,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
@@ -668,6 +671,10 @@ ChromeMainDelegate::~ChromeMainDelegate() {
ChromeMainDelegate::~ChromeMainDelegate() = default;
#endif // !BUILDFLAG(IS_ANDROID)
@ -30,7 +30,7 @@ index 3a1539905f1fb..84071f39325a2 100644
absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
InvokedIn invoked_in) {
DCHECK(base::ThreadPoolInstance::Get());
@@ -876,7 +883,8 @@ absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
@@ -885,7 +892,8 @@ absl::optional<int> ChromeMainDelegate::PostEarlyInitialization(
if (base::FeatureList::IsEnabled(
features::kWriteBasicSystemProfileToPersistentHistogramsFile)) {
@ -40,7 +40,7 @@ index 3a1539905f1fb..84071f39325a2 100644
#if BUILDFLAG(IS_ANDROID)
record =
base::FeatureList::IsEnabled(chrome::android::kUmaBackgroundSessions);
@@ -1304,6 +1312,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1321,6 +1329,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
std::string process_type =
command_line.GetSwitchValueASCII(switches::kProcessType);
@ -48,7 +48,7 @@ index 3a1539905f1fb..84071f39325a2 100644
crash_reporter::InitializeCrashKeys();
#if BUILDFLAG(IS_POSIX)
@@ -1314,6 +1323,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1331,6 +1340,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
InitMacCrashReporter(command_line, process_type);
SetUpInstallerPreferences(command_line);
#endif
@ -56,7 +56,7 @@ index 3a1539905f1fb..84071f39325a2 100644
#if BUILDFLAG(IS_WIN)
child_process_logging::Init();
@@ -1508,6 +1518,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1525,6 +1535,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@ -64,7 +64,7 @@ index 3a1539905f1fb..84071f39325a2 100644
#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
@@ -1551,6 +1562,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
@@ -1568,6 +1579,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 3a1539905f1fb..84071f39325a2 100644
#if BUILDFLAG(ENABLE_PDF)
MaybePatchGdiGetFontData();
@@ -1670,6 +1682,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1687,6 +1699,7 @@ void ChromeMainDelegate::ZygoteForked() {
SetUpProfilingShutdownHandler();
}
@ -80,7 +80,7 @@ index 3a1539905f1fb..84071f39325a2 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 =
@@ -1692,6 +1705,7 @@ void ChromeMainDelegate::ZygoteForked() {
@@ -1709,6 +1722,7 @@ void ChromeMainDelegate::ZygoteForked() {
// Reset the command line for the newly spawned process.
crash_keys::SetCrashKeysFromCommandLine(*command_line);
@ -88,7 +88,7 @@ index 3a1539905f1fb..84071f39325a2 100644
}
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -1789,6 +1803,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
@@ -1806,6 +1820,7 @@ void ChromeMainDelegate::InitializeMemorySystem() {
channel == version_info::Channel::DEV);
const bool gwp_asan_boost_sampling = is_canary_dev || is_browser_process;
@ -96,10 +96,10 @@ index 3a1539905f1fb..84071f39325a2 100644
memory_system::Initializer()
.SetGwpAsanParameters(gwp_asan_boost_sampling, process_type)
.SetProfilingClientParameters(channel,
@@ -1797,5 +1812,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
PoissonAllocationSamplerInclusion::kEnforce,
@@ -1815,5 +1830,5 @@ void ChromeMainDelegate::InitializeMemorySystem() {
memory_system::DispatcherParameters::
AllocationTraceRecorderInclusion::kDynamic)
AllocationTraceRecorderInclusion::kDynamic,
process_type)
- .Initialize(memory_system_);
+ .Initialize(*memory_system_);
}
@ -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 c54e44c41861a..cee906951e418 100644
index a0e5294e27b74..4b32afdb405e1 100644
--- chrome/browser/chrome_browser_main.cc
+++ chrome/browser/chrome_browser_main.cc
@@ -51,6 +51,7 @@
@ -155,7 +155,7 @@ index c54e44c41861a..cee906951e418 100644
#if BUILDFLAG(IS_WIN)
// Check if there is any machine level Chrome installed on the current
@@ -1656,12 +1657,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1655,12 +1656,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
browser_process_->local_state());
}
@ -170,7 +170,7 @@ index c54e44c41861a..cee906951e418 100644
#if BUILDFLAG(IS_ANDROID)
page_info::SetPageInfoClient(new ChromePageInfoClient());
@@ -1807,6 +1810,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1806,6 +1809,10 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
}
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@ -181,7 +181,7 @@ index c54e44c41861a..cee906951e418 100644
// This step is costly and is already measured in
// Startup.StartupBrowserCreator_Start.
// See the comment above for an explanation of |process_command_line|.
@@ -1845,11 +1852,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
@@ -1844,11 +1851,14 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunImpl() {
// Create the RunLoop for MainMessageLoopRun() to use and transfer
// ownership of the browser's lifetime to the BrowserProcess.
@ -233,7 +233,7 @@ index ad3976cb46454..b49f7467156ed 100644
+#endif
}
diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc
index 6c5105b963a03..7b326cbc9246c 100644
index 577b267f601c9..0731b3c7c2a9a 100644
--- chrome/browser/chrome_content_browser_client.cc
+++ chrome/browser/chrome_content_browser_client.cc
@@ -41,6 +41,7 @@
@ -244,7 +244,7 @@ index 6c5105b963a03..7b326cbc9246c 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"
@@ -1535,6 +1536,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
@@ -1542,6 +1543,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() {
}
ChromeContentBrowserClient::ChromeContentBrowserClient() {
@ -253,7 +253,7 @@ index 6c5105b963a03..7b326cbc9246c 100644
#if BUILDFLAG(ENABLE_PLUGINS)
extra_parts_.push_back(
std::make_unique<ChromeContentBrowserClientPluginsPart>());
@@ -1567,6 +1570,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
@@ -1574,6 +1577,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() {
}
}
@ -265,7 +265,7 @@ index 6c5105b963a03..7b326cbc9246c 100644
// static
void ChromeContentBrowserClient::RegisterLocalStatePrefs(
PrefRegistrySimple* registry) {
@@ -4316,9 +4324,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
@@ -4370,9 +4378,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated(
&search::HandleNewTabURLReverseRewrite);
#endif // BUILDFLAG(IS_ANDROID)
@ -277,7 +277,7 @@ index 6c5105b963a03..7b326cbc9246c 100644
}
base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() {
@@ -6335,7 +6345,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
@@ -6421,7 +6431,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated(
#endif
}
@ -286,7 +286,7 @@ index 6c5105b963a03..7b326cbc9246c 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -6353,6 +6363,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
@@ -6439,6 +6449,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams(
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = GetApplicationLocale();
}
@ -295,7 +295,7 @@ index 6c5105b963a03..7b326cbc9246c 100644
}
std::vector<base::FilePath>
@@ -7377,10 +7389,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
@@ -7479,10 +7491,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted(
const auto now = base::TimeTicks::Now();
const auto timeout = GetKeepaliveTimerTimeout(context);
keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout);
@ -308,7 +308,7 @@ index 6c5105b963a03..7b326cbc9246c 100644
FROM_HERE, keepalive_deadline_ - now,
base::BindOnce(
&ChromeContentBrowserClient::OnKeepaliveTimerFired,
@@ -7399,7 +7411,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
@@ -7501,7 +7513,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() {
--num_keepalive_requests_;
if (num_keepalive_requests_ == 0) {
DVLOG(1) << "Stopping the keepalive timer";
@ -318,7 +318,7 @@ index 6c5105b963a03..7b326cbc9246c 100644
// This deletes the keep alive handle attached to the timer function and
// unblock the shutdown sequence.
}
@@ -7535,7 +7548,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
@@ -7637,7 +7650,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired(
const auto now = base::TimeTicks::Now();
const auto then = keepalive_deadline_;
if (now < then) {
@ -328,10 +328,10 @@ index 6c5105b963a03..7b326cbc9246c 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 599083d73c876..c6c565291a8fe 100644
index 586092a7e7265..405df5e535f51 100644
--- chrome/browser/chrome_content_browser_client.h
+++ chrome/browser/chrome_content_browser_client.h
@@ -136,6 +136,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -137,6 +137,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
~ChromeContentBrowserClient() override;
@ -340,7 +340,7 @@ index 599083d73c876..c6c565291a8fe 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.
@@ -630,7 +632,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -639,7 +641,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
override;
void OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) override;
@ -349,7 +349,7 @@ index 599083d73c876..c6c565291a8fe 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1049,7 +1051,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
@@ -1062,7 +1064,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if !BUILDFLAG(IS_ANDROID)
uint64_t num_keepalive_requests_ = 0;
@ -359,7 +359,7 @@ index 599083d73c876..c6c565291a8fe 100644
#endif
diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc
index 645106f10a85f..67a5dd14b1a2b 100644
index d31fb76db85de..6c5cdb0526c01 100644
--- chrome/browser/prefs/browser_prefs.cc
+++ chrome/browser/prefs/browser_prefs.cc
@@ -13,6 +13,7 @@
@ -370,7 +370,7 @@ index 645106f10a85f..67a5dd14b1a2b 100644
#include "chrome/browser/about_flags.h"
#include "chrome/browser/accessibility/accessibility_labels_service.h"
#include "chrome/browser/accessibility/accessibility_ui.h"
@@ -179,6 +180,10 @@
@@ -180,6 +181,10 @@
#include "chrome/browser/background/background_mode_manager.h"
#endif
@ -381,7 +381,7 @@ index 645106f10a85f..67a5dd14b1a2b 100644
#if BUILDFLAG(ENABLE_EXTENSIONS)
#include "chrome/browser/accessibility/animation_policy_prefs.h"
#include "chrome/browser/apps/platform_apps/shortcut_manager.h"
@@ -1529,6 +1534,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1578,6 +1583,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
// This is intentionally last.
RegisterLocalStatePrefsForMigration(registry);
@ -393,7 +393,7 @@ index 645106f10a85f..67a5dd14b1a2b 100644
}
// Register prefs applicable to all profiles.
@@ -1930,6 +1940,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -1984,6 +1994,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
const std::string& locale) {
RegisterProfilePrefs(registry, locale);

102
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 728db9db53e6c..6a6f6bede9985 100644
index 02cc754da4225..58b21e3918231 100644
--- chrome/browser/ui/browser_command_controller.cc
+++ chrome/browser/ui/browser_command_controller.cc
@@ -408,6 +408,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -400,6 +400,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 728db9db53e6c..6a6f6bede9985 100644
return false;
}
@@ -424,6 +425,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
@@ -416,6 +417,13 @@ bool BrowserCommandController::ExecuteCommandWithDisposition(
DCHECK(command_updater_.IsCommandEnabled(id))
<< "Invalid/disabled command " << id;
@ -24,7 +24,7 @@ index 728db9db53e6c..6a6f6bede9985 100644
// The order of commands in this switch statement must match the function
// declaration order in browser.h!
switch (id) {
@@ -1155,11 +1163,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
@@ -1147,11 +1155,13 @@ void BrowserCommandController::TabRestoreServiceLoaded(
// BrowserCommandController, private:
bool BrowserCommandController::IsShowingMainUI() {
@ -41,7 +41,7 @@ index 728db9db53e6c..6a6f6bede9985 100644
bool BrowserCommandController::IsWebAppOrCustomTab() const {
diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc
index 9bbe98269afb6..99ba07e148f84 100644
index 1e7083240e30c..dcac39ae73469 100644
--- chrome/browser/ui/toolbar/app_menu_model.cc
+++ chrome/browser/ui/toolbar/app_menu_model.cc
@@ -585,6 +585,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel(
@ -102,7 +102,7 @@ index 9bbe98269afb6..99ba07e148f84 100644
} // namespace
////////////////////////////////////////////////////////////////////////////////
@@ -1303,7 +1354,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
@@ -1315,7 +1366,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const {
return false;
}
@ -111,7 +111,7 @@ index 9bbe98269afb6..99ba07e148f84 100644
GlobalError* error =
GlobalErrorServiceFactory::GetForProfile(browser_->profile())
->GetGlobalErrorByMenuItemCommandID(command_id);
@@ -1318,6 +1369,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
@@ -1330,6 +1381,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const {
}
}
@ -142,8 +142,8 @@ index 9bbe98269afb6..99ba07e148f84 100644
bool AppMenuModel::IsCommandIdAlerted(int command_id) const {
if ((command_id == IDC_RECENT_TABS_MENU) ||
(command_id == AppMenuModel::kMinRecentTabsCommandId)) {
@@ -1468,11 +1543,15 @@ void AppMenuModel::Build() {
}
@@ -1497,11 +1572,15 @@ void AppMenuModel::Build() {
kDefaultIconSize));
}
- AddSeparator(features::IsChromeRefresh2023() ? ui::NORMAL_SEPARATOR
@ -163,7 +163,7 @@ index 9bbe98269afb6..99ba07e148f84 100644
AddItemWithStringId(IDC_PRINT, IDS_PRINT);
@@ -1545,9 +1624,13 @@ void AppMenuModel::Build() {
@@ -1572,9 +1651,13 @@ void AppMenuModel::Build() {
kMoreToolsMenuItem);
if (!features::IsChromeRefresh2023()) {
@ -180,7 +180,7 @@ index 9bbe98269afb6..99ba07e148f84 100644
}
if (!features::IsChromeRefresh2023()) {
@@ -1629,6 +1712,11 @@ void AppMenuModel::Build() {
@@ -1656,6 +1739,11 @@ void AppMenuModel::Build() {
SetCommandIcon(this, IDC_EXIT, kExitMenuIcon);
}
@ -193,10 +193,10 @@ index 9bbe98269afb6..99ba07e148f84 100644
}
diff --git chrome/browser/ui/toolbar/app_menu_model.h chrome/browser/ui/toolbar/app_menu_model.h
index 4d70f711ce633..2a3834702dca2 100644
index 4d50034fc658d..a23a871f7f17d 100644
--- chrome/browser/ui/toolbar/app_menu_model.h
+++ chrome/browser/ui/toolbar/app_menu_model.h
@@ -194,6 +194,7 @@ class AppMenuModel : public ui::SimpleMenuModel,
@@ -195,6 +195,7 @@ class AppMenuModel : public ui::SimpleMenuModel,
void ExecuteCommand(int command_id, int event_flags) override;
bool IsCommandIdChecked(int command_id) const override;
bool IsCommandIdEnabled(int command_id) const override;
@ -204,9 +204,9 @@ index 4d70f711ce633..2a3834702dca2 100644
bool IsCommandIdAlerted(int command_id) const override;
bool GetAcceleratorForCommandId(int command_id,
ui::Accelerator* accelerator) const override;
@@ -218,6 +219,8 @@ class AppMenuModel : public ui::SimpleMenuModel,
// Appends a zoom menu (without separators).
void CreateZoomMenu();
@@ -227,6 +228,8 @@ class AppMenuModel : public ui::SimpleMenuModel,
// took to select the command.
void LogMenuMetrics(int command_id);
+ bool IsCommandIdEnabledInternal(int command_id) const;
+
@ -231,10 +231,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 d9f30b0876f4a..c4675bf8b95b7 100644
index 235307773037f..56a5af5e44bd6 100644
--- chrome/browser/ui/views/frame/browser_frame.cc
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -75,15 +75,23 @@ bool IsUsingLinuxSystemTheme(Profile* profile) {
@@ -90,15 +90,23 @@ ui::ColorProviderKey::SchemeVariant GetSchemeVariant(
////////////////////////////////////////////////////////////////////////////////
// BrowserFrame, public:
@ -260,7 +260,7 @@ index d9f30b0876f4a..c4675bf8b95b7 100644
}
BrowserFrame::~BrowserFrame() {}
@@ -178,6 +186,12 @@ void BrowserFrame::LayoutWebAppWindowTitle(
@@ -193,6 +201,12 @@ void BrowserFrame::LayoutWebAppWindowTitle(
}
int BrowserFrame::GetTopInset() const {
@ -273,7 +273,7 @@ index d9f30b0876f4a..c4675bf8b95b7 100644
return browser_frame_view_->GetTopInset(false);
}
@@ -194,6 +208,8 @@ BrowserNonClientFrameView* BrowserFrame::GetFrameView() const {
@@ -209,6 +223,8 @@ BrowserNonClientFrameView* BrowserFrame::GetFrameView() const {
}
bool BrowserFrame::UseCustomFrame() const {
@ -282,7 +282,7 @@ index d9f30b0876f4a..c4675bf8b95b7 100644
return native_browser_frame_->UseCustomFrame();
}
@@ -207,20 +223,30 @@ bool BrowserFrame::ShouldDrawFrameHeader() const {
@@ -222,20 +238,30 @@ bool BrowserFrame::ShouldDrawFrameHeader() const {
void BrowserFrame::GetWindowPlacement(gfx::Rect* bounds,
ui::WindowShowState* show_state) const {
@ -313,7 +313,7 @@ index d9f30b0876f4a..c4675bf8b95b7 100644
browser_frame_view_->OnBrowserViewInitViewsComplete();
}
@@ -300,6 +326,8 @@ BrowserFrame::GetCustomTheme() const {
@@ -315,6 +341,8 @@ ui::ColorProviderKey::ThemeInitializerSupplier* BrowserFrame::GetCustomTheme()
}
void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
@ -322,16 +322,16 @@ index d9f30b0876f4a..c4675bf8b95b7 100644
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@@ -411,6 +439,8 @@ void BrowserFrame::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
@@ -426,6 +454,8 @@ void BrowserFrame::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
ui::ColorProviderManager::Key BrowserFrame::GetColorProviderKey() const {
ui::ColorProviderKey BrowserFrame::GetColorProviderKey() const {
auto key = Widget::GetColorProviderKey();
+ if (!browser_view_)
+ return key;
// color_mode.
[this, &key]() {
@@ -558,5 +588,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
@@ -580,5 +610,8 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
}
bool BrowserFrame::IsIncognitoBrowser() const {
@ -341,7 +341,7 @@ index d9f30b0876f4a..c4675bf8b95b7 100644
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 965bd2525b212..6a637609b65e9 100644
index 77ca1dbf118f9..c60711991d093 100644
--- chrome/browser/ui/views/frame/browser_frame.h
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -61,7 +61,9 @@ enum class TabDragKind {
@ -355,10 +355,10 @@ index 965bd2525b212..6a637609b65e9 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 306affc1d9573..3a7cad35c6352 100644
index 7005d2c0be663..8d55893627837 100644
--- chrome/browser/ui/views/frame/browser_view.cc
+++ chrome/browser/ui/views/frame/browser_view.cc
@@ -320,11 +320,10 @@ using content::NativeWebKeyboardEvent;
@@ -327,11 +327,10 @@ using content::NativeWebKeyboardEvent;
using content::WebContents;
using web_modal::WebContentsModalDialogHost;
@ -373,7 +373,7 @@ index 306affc1d9573..3a7cad35c6352 100644
#if BUILDFLAG(IS_CHROMEOS_ASH)
// UMA histograms that record animation smoothness for tab loading animation.
@@ -793,11 +792,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
@@ -800,11 +799,22 @@ class BrowserView::AccessibilityModeObserver : public ui::AXModeObserver {
///////////////////////////////////////////////////////////////////////////////
// BrowserView, public:
@ -397,7 +397,7 @@ index 306affc1d9573..3a7cad35c6352 100644
SetShowIcon(
::ShouldShowWindowIcon(browser_.get(), AppUsesWindowControlsOverlay()));
@@ -841,7 +851,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -848,7 +858,6 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
}
browser_->tab_strip_model()->AddObserver(this);
@ -405,7 +405,7 @@ index 306affc1d9573..3a7cad35c6352 100644
// Top container holds tab strip region and toolbar and lives at the front of
// the view hierarchy.
@@ -897,8 +906,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
@@ -904,8 +913,15 @@ BrowserView::BrowserView(std::unique_ptr<Browser> browser)
contents_container->SetLayoutManager(std::make_unique<ContentsLayoutManager>(
devtools_web_view_, contents_web_view_));
@ -423,7 +423,7 @@ index 306affc1d9573..3a7cad35c6352 100644
contents_separator_ =
top_container_->AddChildView(std::make_unique<ContentsSeparator>());
@@ -1086,12 +1102,14 @@ gfx::Size BrowserView::GetWebAppFrameToolbarPreferredSize() const {
@@ -1089,12 +1105,14 @@ gfx::Size BrowserView::GetWebAppFrameToolbarPreferredSize() const {
#if BUILDFLAG(IS_MAC)
bool BrowserView::UsesImmersiveFullscreenMode() const {
@ -440,7 +440,7 @@ index 306affc1d9573..3a7cad35c6352 100644
}
bool BrowserView::UsesImmersiveFullscreenTabbedMode() const {
@@ -1816,6 +1834,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
@@ -1820,6 +1838,8 @@ bool BrowserView::ShouldHideUIForFullscreen() const {
if (immersive_mode_controller_->IsEnabled())
return false;
@ -449,7 +449,7 @@ index 306affc1d9573..3a7cad35c6352 100644
return frame_->GetFrameView()->ShouldHideTopUIForFullscreen();
}
@@ -2759,7 +2779,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
@@ -2817,7 +2837,8 @@ DownloadShelf* BrowserView::GetDownloadShelf() {
}
DownloadBubbleUIController* BrowserView::GetDownloadBubbleUIController() {
@ -459,7 +459,7 @@ index 306affc1d9573..3a7cad35c6352 100644
if (auto* download_button = toolbar_button_provider_->GetDownloadButton())
return download_button->bubble_controller();
return nullptr;
@@ -3295,7 +3316,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
@@ -3353,7 +3374,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() {
if (top_container()->parent() == this)
return;
@ -469,7 +469,7 @@ index 306affc1d9573..3a7cad35c6352 100644
top_container()->DestroyLayer();
AddChildViewAt(top_container(), 0);
EnsureFocusOrder();
@@ -3852,8 +3874,10 @@ void BrowserView::Layout() {
@@ -3928,8 +3950,10 @@ void BrowserView::Layout() {
// TODO(jamescook): Why was this in the middle of layout code?
toolbar_->location_bar()->omnibox_view()->SetFocusBehavior(
@ -482,7 +482,7 @@ index 306affc1d9573..3a7cad35c6352 100644
// Some of the situations when the BrowserView is laid out are:
// - Enter/exit immersive fullscreen mode.
@@ -3919,6 +3943,11 @@ void BrowserView::AddedToWidget() {
@@ -3995,6 +4019,11 @@ void BrowserView::AddedToWidget() {
SetThemeProfileForWindow(GetNativeWindow(), browser_->profile());
#endif
@ -494,7 +494,7 @@ index 306affc1d9573..3a7cad35c6352 100644
toolbar_->Init();
// TODO(pbos): Investigate whether the side panels should be creatable when
@@ -3966,13 +3995,9 @@ void BrowserView::AddedToWidget() {
@@ -4042,13 +4071,9 @@ void BrowserView::AddedToWidget() {
EnsureFocusOrder();
@ -510,7 +510,7 @@ index 306affc1d9573..3a7cad35c6352 100644
using_native_frame_ = frame_->ShouldUseNativeFrame();
MaybeInitializeWebUITabStrip();
@@ -4377,7 +4402,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
@@ -4453,7 +4478,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen,
// Undo our anti-jankiness hacks and force a re-layout.
in_process_fullscreen_ = false;
ToolbarSizeChanged(false);
@ -520,7 +520,7 @@ index 306affc1d9573..3a7cad35c6352 100644
}
bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const {
@@ -4748,6 +4774,8 @@ Profile* BrowserView::GetProfile() {
@@ -4822,6 +4848,8 @@ Profile* BrowserView::GetProfile() {
}
void BrowserView::UpdateUIForTabFullscreen() {
@ -529,7 +529,7 @@ index 306affc1d9573..3a7cad35c6352 100644
frame()->GetFrameView()->UpdateFullscreenTopUI();
}
@@ -4770,6 +4798,8 @@ void BrowserView::HideDownloadShelf() {
@@ -4844,6 +4872,8 @@ void BrowserView::HideDownloadShelf() {
}
bool BrowserView::CanUserExitFullscreen() const {
@ -539,10 +539,10 @@ index 306affc1d9573..3a7cad35c6352 100644
}
diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h
index bde91001c6f75..a7434456fc75f 100644
index e149a732b5d06..b8ae00f1e44b8 100644
--- chrome/browser/ui/views/frame/browser_view.h
+++ chrome/browser/ui/views/frame/browser_view.h
@@ -123,11 +123,16 @@ class BrowserView : public BrowserWindow,
@@ -124,11 +124,16 @@ class BrowserView : public BrowserWindow,
public webapps::AppBannerManager::Observer {
public:
METADATA_HEADER(BrowserView);
@ -559,7 +559,7 @@ index bde91001c6f75..a7434456fc75f 100644
void set_frame(BrowserFrame* frame) {
frame_ = frame;
paint_as_active_subscription_ =
@@ -783,6 +788,12 @@ class BrowserView : public BrowserWindow,
@@ -788,6 +793,12 @@ class BrowserView : public BrowserWindow,
return web_app_frame_toolbar();
}
@ -573,7 +573,7 @@ index bde91001c6f75..a7434456fc75f 100644
// Do not friend BrowserViewLayout. Use the BrowserViewLayoutDelegate
// interface to keep these two classes decoupled and testable.
diff --git chrome/browser/ui/views/frame/browser_view_layout.cc chrome/browser/ui/views/frame/browser_view_layout.cc
index 25fa3e495f4b1..21ef37e0b2495 100644
index f6c2991d8c453..459f39740a2de 100644
--- chrome/browser/ui/views/frame/browser_view_layout.cc
+++ chrome/browser/ui/views/frame/browser_view_layout.cc
@@ -47,6 +47,10 @@
@ -587,7 +587,7 @@ index 25fa3e495f4b1..21ef37e0b2495 100644
using views::View;
using web_modal::ModalDialogHostObserver;
using web_modal::WebContentsModalDialogHost;
@@ -569,6 +573,13 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) {
@@ -566,6 +570,13 @@ int BrowserViewLayout::LayoutWebUITabStrip(int top) {
int BrowserViewLayout::LayoutToolbar(int top) {
TRACE_EVENT0("ui", "BrowserViewLayout::LayoutToolbar");
@ -602,10 +602,10 @@ index 25fa3e495f4b1..21ef37e0b2495 100644
bool toolbar_visible = delegate_->IsToolbarVisible();
int height = toolbar_visible ? toolbar_->GetPreferredSize().height() : 0;
diff --git chrome/browser/ui/views/frame/contents_web_view.cc chrome/browser/ui/views/frame/contents_web_view.cc
index 5e059b9878fc2..c1f6fbcd40ec4 100644
index 8267a265a8e10..ee08f18e96a34 100644
--- chrome/browser/ui/views/frame/contents_web_view.cc
+++ chrome/browser/ui/views/frame/contents_web_view.cc
@@ -26,6 +26,11 @@
@@ -23,6 +23,11 @@
ContentsWebView::ContentsWebView(content::BrowserContext* browser_context)
: views::WebView(browser_context),
status_bubble_(nullptr) {
@ -618,7 +618,7 @@ 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 21e08a062b192..c9b6ba5cc7538 100644
index 09e828d1e079e..7f42618d67e77 100644
--- chrome/browser/ui/views/page_action/page_action_icon_controller.cc
+++ chrome/browser/ui/views/page_action/page_action_icon_controller.cc
@@ -94,6 +94,12 @@ void PageActionIconController::Init(const PageActionIconParams& params,
@ -635,10 +635,10 @@ index 21e08a062b192..c9b6ba5cc7538 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 fb8bfdbcb2bd5..741d84ecba4ea 100644
index dc792bea0ab88..e02cdd3214b1d 100644
--- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -559,29 +559,41 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
@@ -560,29 +560,41 @@ gfx::Range BrowserTabStripController::ListTabsInGroup(
}
bool BrowserTabStripController::IsFrameCondensed() const {

4
patch/patches/component_build.patch
View File

@ -1,5 +1,5 @@
diff --git content/browser/devtools/devtools_instrumentation.h content/browser/devtools/devtools_instrumentation.h
index 7e32effcb4b8c..71bfd6c0f4c5c 100644
index e01c49c01b820..8e8634b2f96ba 100644
--- content/browser/devtools/devtools_instrumentation.h
+++ content/browser/devtools/devtools_instrumentation.h
@@ -102,7 +102,7 @@ bool ApplyUserAgentMetadataOverrides(
@ -68,7 +68,7 @@ index 97c7dc7c25000..63c42610bfd9c 100644
blink::mojom::V8CacheOptions GetV8CacheOptions();
diff --git third_party/blink/renderer/controller/BUILD.gn third_party/blink/renderer/controller/BUILD.gn
index 53cc163cde365..bf2aa2df19ded 100644
index 1b0bfc81ebda9..fb5b9f1c1fc1a 100644
--- third_party/blink/renderer/controller/BUILD.gn
+++ third_party/blink/renderer/controller/BUILD.gn
@@ -35,6 +35,7 @@ component("controller") {

34
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 b8649b77e9a29..0d25d60e81b1a 100644
index cfac536ad9eed..f47e947b6c972 100644
--- content/browser/loader/navigation_url_loader_impl.cc
+++ content/browser/loader/navigation_url_loader_impl.cc
@@ -751,6 +751,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() {
@@ -755,6 +755,17 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() {
resource_request_->has_user_gesture, initiating_origin,
initiator_document_.AsRenderFrameHostIfValid(), &loader_factory);
@ -34,10 +34,10 @@ index b8649b77e9a29..0d25d60e81b1a 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 d9b45cc4c8277..6dfa6ed1a6500 100644
index 13db98964e657..eb2dc54600e34 100644
--- content/public/browser/content_browser_client.cc
+++ content/public/browser/content_browser_client.cc
@@ -1006,7 +1006,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
@@ -1024,7 +1024,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload(
void ContentBrowserClient::OnNetworkServiceCreated(
network::mojom::NetworkService* network_service) {}
@ -46,7 +46,7 @@ index d9b45cc4c8277..6dfa6ed1a6500 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -1015,6 +1015,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
@@ -1033,6 +1033,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams(
cert_verifier_creation_params) {
network_context_params->user_agent = GetUserAgentBasedOnPolicy(context);
network_context_params->accept_language = "en-us,en";
@ -55,18 +55,18 @@ index d9b45cc4c8277..6dfa6ed1a6500 100644
std::vector<base::FilePath>
diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h
index f750767092895..d19f046ed2846 100644
index 421df3e1f6d23..4448cc23084a8 100644
--- content/public/browser/content_browser_client.h
+++ content/public/browser/content_browser_client.h
@@ -37,6 +37,7 @@
#include "content/public/browser/login_delegate.h"
@@ -38,6 +38,7 @@
#include "content/public/browser/mojo_binder_policy_map.h"
#include "content/public/browser/privacy_sandbox_invoking_api.h"
#include "content/public/browser/storage_partition_config.h"
+#include "content/public/browser/web_contents.h"
#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"
@@ -1868,7 +1869,7 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -1890,7 +1891,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 f750767092895..d19f046ed2846 100644
BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -2076,6 +2077,19 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2102,6 +2103,19 @@ class CONTENT_EXPORT ContentBrowserClient {
RenderFrameHost* initiator_document,
mojo::PendingRemote<network::mojom::URLLoaderFactory>* out_factory);
@ -95,7 +95,7 @@ index f750767092895..d19f046ed2846 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.
@@ -2132,6 +2146,10 @@ class CONTENT_EXPORT ContentBrowserClient {
@@ -2158,6 +2172,10 @@ class CONTENT_EXPORT ContentBrowserClient {
// Used as part of the user agent string.
virtual std::string GetProduct();
@ -132,7 +132,7 @@ index a4130ad4dc815..b303f6c8768b7 100644
// started.
virtual void SetRuntimeFeaturesDefaultsBeforeBlinkInitialization() {}
diff --git content/renderer/render_thread_impl.cc content/renderer/render_thread_impl.cc
index b1ad4bd6c6108..b2f6cef961faf 100644
index 9bdebf527329f..fd5f9daba2c4e 100644
--- content/renderer/render_thread_impl.cc
+++ content/renderer/render_thread_impl.cc
@@ -620,6 +620,8 @@ void RenderThreadImpl::Init() {
@ -145,10 +145,10 @@ index b1ad4bd6c6108..b2f6cef961faf 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 134a4b1f1ce8f..c2de5eb620bf5 100644
index 1b248fb88e20b..1ef54fc4ce963 100644
--- content/renderer/renderer_blink_platform_impl.cc
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -943,6 +943,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
@@ -946,6 +946,15 @@ SkBitmap* RendererBlinkPlatformImpl::GetSadPageBitmap() {
//------------------------------------------------------------------------------
@ -179,10 +179,10 @@ index 587565fa2fd5d..d68eeea7e842e 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 2a26ffc86c946..ee88229940a74 100644
index ebdf4bcc2cbc8..3b4d19fae70d3 100644
--- headless/lib/browser/headless_content_browser_client.cc
+++ headless/lib/browser/headless_content_browser_client.cc
@@ -298,7 +298,7 @@ bool HeadlessContentBrowserClient::IsSharedStorageSelectURLAllowed(
@@ -297,7 +297,7 @@ bool HeadlessContentBrowserClient::IsSharedStorageSelectURLAllowed(
return true;
}
@ -191,7 +191,7 @@ index 2a26ffc86c946..ee88229940a74 100644
content::BrowserContext* context,
bool in_memory,
const base::FilePath& relative_partition_path,
@@ -308,6 +308,7 @@ void HeadlessContentBrowserClient::ConfigureNetworkContextParams(
@@ -307,6 +307,7 @@ void HeadlessContentBrowserClient::ConfigureNetworkContextParams(
HeadlessBrowserContextImpl::From(context)->ConfigureNetworkContextParams(
in_memory, relative_partition_path, network_context_params,
cert_verifier_creation_params);

2
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 ab6bc68812e36..1cd5ba7bd27f3 100644
index 6cb42330a794c..f5294cc06ced3 100644
--- content/app/content_main_runner_impl.cc
+++ content/app/content_main_runner_impl.cc
@@ -46,6 +46,7 @@

12
patch/patches/crashpad_1995.patch
View File

@ -134,10 +134,10 @@ index d802db81c88ef..f78029680e366 100644
// on the given |command_line|.
void SetCrashKeysFromCommandLine(const base::CommandLine& command_line);
diff --git components/crash/core/app/crash_reporter_client.cc components/crash/core/app/crash_reporter_client.cc
index 284dd099122df..c09c614c11283 100644
index 3f3ed53d48fc4..05bbc81db0c6a 100644
--- components/crash/core/app/crash_reporter_client.cc
+++ components/crash/core/app/crash_reporter_client.cc
@@ -93,7 +93,7 @@ bool CrashReporterClient::GetShouldDumpLargerDumps() {
@@ -89,7 +89,7 @@ bool CrashReporterClient::GetShouldDumpLargerDumps() {
}
#endif
@ -146,7 +146,7 @@ index 284dd099122df..c09c614c11283 100644
void CrashReporterClient::GetProductNameAndVersion(const char** product_name,
const char** version) {
}
@@ -102,6 +102,7 @@ void CrashReporterClient::GetProductNameAndVersion(std::string* product_name,
@@ -98,6 +98,7 @@ void CrashReporterClient::GetProductNameAndVersion(std::string* product_name,
std::string* version,
std::string* channel) {}
@ -154,7 +154,7 @@ index 284dd099122df..c09c614c11283 100644
base::FilePath CrashReporterClient::GetReporterLogFilename() {
return base::FilePath();
}
@@ -111,6 +112,7 @@ bool CrashReporterClient::HandleCrashDump(const char* crashdump_filename,
@@ -107,6 +108,7 @@ bool CrashReporterClient::HandleCrashDump(const char* crashdump_filename,
return false;
}
#endif
@ -162,7 +162,7 @@ index 284dd099122df..c09c614c11283 100644
#if BUILDFLAG(IS_WIN)
bool CrashReporterClient::GetCrashDumpLocation(std::wstring* crash_dir) {
@@ -145,6 +147,28 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
@@ -141,6 +143,28 @@ bool CrashReporterClient::ReportingIsEnforcedByPolicy(bool* breakpad_enabled) {
return false;
}
@ -191,7 +191,7 @@ index 284dd099122df..c09c614c11283 100644
#if BUILDFLAG(IS_ANDROID)
unsigned int CrashReporterClient::GetCrashDumpPercentage() {
return 100;
@@ -207,9 +231,4 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() {
@@ -197,9 +221,4 @@ bool CrashReporterClient::ShouldMonitorCrashHandlerExpensively() {
return false;
}

6
patch/patches/crashpad_tp_1995.patch
View File

@ -146,7 +146,7 @@ index 39b2de869d225..5a4e621c650ee 100644
struct Data;
diff --git third_party/crashpad/crashpad/handler/BUILD.gn third_party/crashpad/crashpad/handler/BUILD.gn
index 02bf11a6de045..48d00a9c44123 100644
index a2d6f7fb482a7..a5b6ae04f897b 100644
--- third_party/crashpad/crashpad/handler/BUILD.gn
+++ third_party/crashpad/crashpad/handler/BUILD.gn
@@ -12,6 +12,7 @@
@ -157,7 +157,7 @@ index 02bf11a6de045..48d00a9c44123 100644
import("../build/crashpad_buildconfig.gni")
static_library("handler") {
@@ -62,6 +63,17 @@ static_library("handler") {
@@ -61,6 +62,17 @@ static_library("handler") {
]
}
@ -175,7 +175,7 @@ index 02bf11a6de045..48d00a9c44123 100644
public_configs = [ "..:crashpad_config" ]
public_deps = [
@@ -77,6 +89,7 @@ static_library("handler") {
@@ -76,6 +88,7 @@ static_library("handler") {
"../snapshot",
"../third_party/mini_chromium:chromeos_buildflags",
"../tools:tool_support",

2
patch/patches/embedder_product_override.patch
View File

@ -1,5 +1,5 @@
diff --git components/embedder_support/user_agent_utils.cc components/embedder_support/user_agent_utils.cc
index 456414fea977b..3bf7d939aaa50 100644
index 20a84c114dc8c..1474217f0c5e2 100644
--- components/embedder_support/user_agent_utils.cc
+++ components/embedder_support/user_agent_utils.cc
@@ -18,6 +18,7 @@

12
patch/patches/extensions_1947.patch
View File

@ -60,7 +60,7 @@ index cead7cfa14bae..24142c2e4896f 100644
std::unique_ptr<StreamContainer> stream_container(
new StreamContainer(tab_id, embedded, handler_url, extension_id,
diff --git extensions/browser/extension_host.cc extensions/browser/extension_host.cc
index e8045d12672ed..0752c4780b312 100644
index 30d6c2e509ae8..8240b0b078869 100644
--- extensions/browser/extension_host.cc
+++ extensions/browser/extension_host.cc
@@ -62,11 +62,12 @@ ExtensionHost::ExtensionHost(const Extension* extension,
@ -131,7 +131,7 @@ index e8045d12672ed..0752c4780b312 100644
ExtensionRegistry::Get(browser_context_)->RemoveObserver(this);
diff --git extensions/browser/extension_host.h extensions/browser/extension_host.h
index 9ba85048d1fcf..f3a5b8bc9bda0 100644
index 20002c3204d18..a3795d86d1f96 100644
--- extensions/browser/extension_host.h
+++ extensions/browser/extension_host.h
@@ -59,6 +59,12 @@ class ExtensionHost : public DeferredStartRenderHost,
@ -156,7 +156,7 @@ index 9ba85048d1fcf..f3a5b8bc9bda0 100644
content::RenderFrameHost* main_frame_host() const { return main_frame_host_; }
content::RenderProcessHost* render_process_host() const;
bool has_loaded_once() const { return has_loaded_once_; }
@@ -205,7 +211,8 @@ class ExtensionHost : public DeferredStartRenderHost,
@@ -216,7 +222,8 @@ class ExtensionHost : public DeferredStartRenderHost,
raw_ptr<content::BrowserContext> browser_context_;
// The host for our HTML content.
@ -198,7 +198,7 @@ index c3197eb4790fa..1e7ae767b0582 100644
}
diff --git extensions/browser/extensions_browser_client.h extensions/browser/extensions_browser_client.h
index fbef1f4fba931..1f98adb6b0bcb 100644
index b70ec0a3bec7e..bb4280ff00696 100644
--- extensions/browser/extensions_browser_client.h
+++ extensions/browser/extensions_browser_client.h
@@ -32,6 +32,7 @@
@ -209,7 +209,7 @@ index fbef1f4fba931..1f98adb6b0bcb 100644
class PrefService;
namespace base {
@@ -76,6 +77,7 @@ class ComponentExtensionResourceManager;
@@ -80,6 +81,7 @@ class ComponentExtensionResourceManager;
class Extension;
class ExtensionCache;
class ExtensionError;
@ -217,7 +217,7 @@ index fbef1f4fba931..1f98adb6b0bcb 100644
class ExtensionHostDelegate;
class ExtensionSet;
class ExtensionSystem;
@@ -248,6 +250,14 @@ class ExtensionsBrowserClient {
@@ -257,6 +259,14 @@ class ExtensionsBrowserClient {
virtual std::unique_ptr<ExtensionHostDelegate>
CreateExtensionHostDelegate() = 0;

2
patch/patches/font_family_cache_1501.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/font_family_cache.h chrome/browser/font_family_cache.h
index 459a25956e6e3..ef9148bf69e9b 100644
index 6ec531bbc4f0d..df9e376fa9f05 100644
--- chrome/browser/font_family_cache.h
+++ chrome/browser/font_family_cache.h
@@ -19,6 +19,8 @@ class Profile;

17
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 9298bc0945ff2..eb3a9628785f4 100644
index acd08b3cc7ef4..98f64fb279c4e 100644
--- BUILD.gn
+++ BUILD.gn
@@ -19,6 +19,7 @@ import("//build/config/sanitizers/sanitizers.gni")
@ -75,21 +75,8 @@ index 1da479dd5eebc..ff9c7e467997c 100644
- "You must set the wdk_path if you set the visual studio path")
- visual_studio_runtime_dirs = []
}
diff --git chrome/app/framework.order chrome/app/framework.order
index 60f573a736ba5..90dd6d0b37314 100644
--- chrome/app/framework.order
+++ chrome/app/framework.order
@@ -28,3 +28,8 @@ _ChromeMain
_lprofDirMode
___llvm_profile_filename
___llvm_profile_raw_version
+
+# Symbols exported for CEF.
+_OBJC_CLASS_$_UnderlayOpenGLHostingWindow
+_OBJC_METACLASS_$_UnderlayOpenGLHostingWindow
+
diff --git chrome/chrome_paks.gni chrome/chrome_paks.gni
index 7b939af86e260..4f89bcabf4d77 100644
index e90116935b87d..805c3b54b17f7 100644
--- chrome/chrome_paks.gni
+++ chrome/chrome_paks.gni
@@ -6,6 +6,7 @@ import("//ash/ambient/resources/resources.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 887146425378c..7c823a9abc017 100644
index 36e9375a7b656..c4c0d46c2b227 100644
--- tools/gritsettings/resource_ids.spec
+++ tools/gritsettings/resource_ids.spec
@@ -1188,6 +1188,15 @@
@@ -1192,6 +1192,15 @@
# END "everything else" section.
# Everything but chrome/, components/, content/, and ios/

2
patch/patches/linux_bluetooth_1319006.patch
View File

@ -1,5 +1,5 @@
diff --git device/bluetooth/BUILD.gn device/bluetooth/BUILD.gn
index 52940b9bc43aa..3781cc157c6ab 100644
index f619de1d332d7..4ea25b48a27eb 100644
--- device/bluetooth/BUILD.gn
+++ device/bluetooth/BUILD.gn
@@ -46,10 +46,12 @@ source_set("deprecated_experimental_mojo") {

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 cb282e3a526fb..e95bb8c96112b 100644
index 0d3fdc9b8cdff..e76f7ab4129ae 100644
--- ui/accessibility/platform/BUILD.gn
+++ ui/accessibility/platform/BUILD.gn
@@ -283,6 +283,10 @@ component("platform") {
@@ -289,6 +289,10 @@ component("platform") {
if (use_gio) {
configs += [ "//build/linux:gio_config" ]
}

6
patch/patches/mac_event_observer_2539.patch
View File

@ -1,9 +1,9 @@
diff --git content/browser/scheduler/responsiveness/native_event_observer_mac.mm content/browser/scheduler/responsiveness/native_event_observer_mac.mm
index 4aecdd08b7de4..4f5e588a37865 100644
index 38740d438e263..7657fa28bfcb9 100644
--- content/browser/scheduler/responsiveness/native_event_observer_mac.mm
+++ content/browser/scheduler/responsiveness/native_event_observer_mac.mm
@@ -12,13 +12,15 @@ namespace content {
namespace responsiveness {
@@ -15,13 +15,15 @@
namespace content::responsiveness {
void NativeEventObserver::RegisterObserver() {
- DCHECK([NSApp conformsToProtocol:@protocol(NativeEventProcessor)]);

4
patch/patches/mac_fling_scheduler_2540.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/input/fling_scheduler_mac.mm content/browser/renderer_host/input/fling_scheduler_mac.mm
index 50ed39df38044..7839bdaf7b7e5 100644
index 063ccc809ee9b..61b80c72b8a26 100644
--- content/browser/renderer_host/input/fling_scheduler_mac.mm
+++ content/browser/renderer_host/input/fling_scheduler_mac.mm
@@ -26,6 +26,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() {
@@ -30,6 +30,10 @@ ui::Compositor* FlingSchedulerMac::GetCompositor() {
return nullptr;
}

8
patch/patches/mac_platform_style_bubble_893292.patch
View File

@ -1,8 +1,8 @@
diff --git chrome/browser/ui/views/profiles/profile_menu_view_base.cc chrome/browser/ui/views/profiles/profile_menu_view_base.cc
index 4e887ec33d100..67af3165246e5 100644
index 7e8bcef6d5bd9..6cd5df220ff5f 100644
--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
@@ -991,8 +991,8 @@ int ProfileMenuViewBase::GetMaxHeight() const {
@@ -1018,8 +1018,8 @@ int ProfileMenuViewBase::GetMaxHeight() const {
->GetDisplayNearestPoint(anchor_rect.CenterPoint())
.work_area();
int available_space = screen_space.bottom() - anchor_rect.bottom();
@ -14,10 +14,10 @@ index 4e887ec33d100..67af3165246e5 100644
std::max(available_space, anchor_rect.y() - screen_space.y());
#endif
diff --git ui/views/style/platform_style_mac.mm ui/views/style/platform_style_mac.mm
index 256bde37abf47..9ddfa6fc59f0a 100644
index 4a695e7bab33e..5421e39cd5a9c 100644
--- ui/views/style/platform_style_mac.mm
+++ ui/views/style/platform_style_mac.mm
@@ -43,7 +43,7 @@ const bool PlatformStyle::kTableViewSupportsKeyboardNavigationByCell = false;
@@ -47,7 +47,7 @@ const bool PlatformStyle::kTableViewSupportsKeyboardNavigationByCell = false;
const bool PlatformStyle::kTreeViewSelectionPaintsEntireRow = true;
const bool PlatformStyle::kUseRipples = false;
const bool PlatformStyle::kInactiveWidgetControlsAppearDisabled = true;

6
patch/patches/message_pump_mac_2495.patch
View File

@ -1,8 +1,8 @@
diff --git base/message_loop/message_pump_mac.mm base/message_loop/message_pump_mac.mm
index 363dc67d5abad..2d8a96056a05b 100644
index 36d9430360c8f..c1e0b2d533f6d 100644
--- base/message_loop/message_pump_mac.mm
+++ base/message_loop/message_pump_mac.mm
@@ -765,7 +765,8 @@ void MessagePumpUIApplication::Detach() {
@@ -758,7 +758,8 @@ void MessagePumpUIApplication::Detach() {
#else
ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
@ -12,7 +12,7 @@ index 363dc67d5abad..2d8a96056a05b 100644
DCHECK_EQ(kNSApplicationModalSafeModeMask, g_app_pump->GetModeMask());
// Pumping events in private runloop modes is known to interact badly with
// app modal windows like NSAlert.
@@ -776,7 +777,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
@@ -769,7 +770,8 @@ ScopedPumpMessagesInPrivateModes::ScopedPumpMessagesInPrivateModes() {
}
ScopedPumpMessagesInPrivateModes::~ScopedPumpMessagesInPrivateModes() {

15
patch/patches/mime_handler_view_guest_1565_2727.patch
View File

@ -12,10 +12,10 @@ index a3f8485e40bbc..dc8c1aa898f72 100644
virtual ~WebContentsView() = default;
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index 44d0b99677a74..843c49ccaecc3 100644
index 1e1712fdf38ec..6c80de2ae90e6 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -228,6 +228,8 @@ void MimeHandlerViewGuest::CreateWebContents(
@@ -202,6 +202,8 @@ void MimeHandlerViewGuest::CreateWebContents(
WebContents::CreateParams params(browser_context(),
guest_site_instance.get());
params.guest_delegate = this;
@ -24,7 +24,7 @@ index 44d0b99677a74..843c49ccaecc3 100644
std::move(callback).Run(std::move(owned_this),
WebContents::CreateWithSessionStorage(
params, owner_web_contents()
@@ -236,6 +238,10 @@ void MimeHandlerViewGuest::CreateWebContents(
@@ -210,6 +212,10 @@ void MimeHandlerViewGuest::CreateWebContents(
}
void MimeHandlerViewGuest::DidAttachToEmbedder() {
@ -35,7 +35,7 @@ index 44d0b99677a74..843c49ccaecc3 100644
DCHECK(stream_->handler_url().SchemeIs(extensions::kExtensionScheme));
GetController().LoadURL(stream_->handler_url(), content::Referrer(),
ui::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string());
@@ -497,6 +503,14 @@ void MimeHandlerViewGuest::DidFinishNavigation(
@@ -475,6 +481,14 @@ void MimeHandlerViewGuest::DidFinishNavigation(
}
}
@ -51,10 +51,10 @@ index 44d0b99677a74..843c49ccaecc3 100644
mojo::PendingReceiver<mime_handler::BeforeUnloadControl> receiver) {
if (!pending_before_unload_control_)
diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
index 2ade4d0b28ba4..8ba6293863a93 100644
index 397bee1fc011b..7ee1e489503aa 100644
--- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
+++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.h
@@ -196,6 +196,7 @@ class MimeHandlerViewGuest
@@ -193,10 +193,12 @@ class MimeHandlerViewGuest
void ReadyToCommitNavigation(
content::NavigationHandle* navigation_handle) final;
void DidFinishNavigation(content::NavigationHandle* navigation_handle) final;
@ -62,9 +62,6 @@ index 2ade4d0b28ba4..8ba6293863a93 100644
std::unique_ptr<MimeHandlerViewGuestDelegate> delegate_;
std::unique_ptr<StreamContainer> stream_;
@@ -204,6 +205,7 @@ class MimeHandlerViewGuest
content::ChildProcessHost::kInvalidUniqueID, MSG_ROUTING_NONE};
int embedder_widget_routing_id_ = MSG_ROUTING_NONE;
+ bool is_guest_attached_ = false;
bool is_guest_fullscreen_ = false;

20
patch/patches/net_cookie_flags.patch
View File

@ -1,19 +1,19 @@
diff --git net/base/load_flags_list.h net/base/load_flags_list.h
index f936d951fe272..90a3165172dce 100644
index 4fc3870bcfbc8..24c6d32d4a8d8 100644
--- net/base/load_flags_list.h
+++ net/base/load_flags_list.h
@@ -103,3 +103,6 @@ LOAD_FLAG(RESTRICTED_PREFETCH, 1 << 15)
// is considered privileged, and therefore this flag must only be set from a
// trusted process.
LOAD_FLAG(CAN_USE_RESTRICTED_PREFETCH, 1 << 16)
@@ -110,3 +110,6 @@ LOAD_FLAG(CAN_USE_SHARED_DICTIONARY, 1 << 17)
// Indicates that CAN_USE_SHARED_DICTIONARY must be disabled after a redirect to
// another origin.
LOAD_FLAG(DISABLE_SHARED_DICTIONARY_AFTER_CROSS_ORIGIN_REDIRECT, 1 << 18)
+
+// This load will not send any cookies. For CEF usage.
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 17)
+LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 19)
diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc
index 00b3c891bf3bd..82edec32942e7 100644
index b421bab92706a..a47cfb17cec23 100644
--- net/url_request/url_request_http_job.cc
+++ net/url_request/url_request_http_job.cc
@@ -1706,7 +1706,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
@@ -1764,7 +1764,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const {
// Read cookies whenever allow_credentials() is true, even if the PrivacyMode
// is being overridden by NetworkDelegate and will eventually block them, as
// blocked cookies still need to be logged in that case.
@ -24,10 +24,10 @@ index 00b3c891bf3bd..82edec32942e7 100644
bool URLRequestHttpJob::IsPartitionedCookiesEnabled() const {
diff --git services/network/public/cpp/resource_request.cc services/network/public/cpp/resource_request.cc
index 1e15e62d01b6c..a24f0a762c47b 100644
index d5239af9a83d4..70a2cb7728125 100644
--- services/network/public/cpp/resource_request.cc
+++ services/network/public/cpp/resource_request.cc
@@ -288,7 +288,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
@@ -310,7 +310,8 @@ bool ResourceRequest::EqualsForTesting(const ResourceRequest& request) const {
}
bool ResourceRequest::SendsCookies() const {

4
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 95d27f99acc0e..6955c18cde0fd 100644
index f54d14751b488..2200fb38120fa 100644
--- content/browser/renderer_host/render_widget_host_impl.cc
+++ content/browser/renderer_host/render_widget_host_impl.cc
@@ -3250,6 +3250,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
@@ -3237,6 +3237,11 @@ void RenderWidgetHostImpl::OnInvalidInputEventSource() {
GetProcess(), bad_message::INPUT_ROUTER_INVALID_EVENT_SOURCE);
}

8
patch/patches/print_preview_123.patch
View File

@ -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 341fffbe509b5..678a0ed4d2b26 100644
index e487948be00f9..bc77213050069 100644
--- chrome/browser/ui/webui/print_preview/print_preview_ui.cc
+++ chrome/browser/ui/webui/print_preview/print_preview_ui.cc
@@ -23,6 +23,7 @@
@@ -24,6 +24,7 @@
#include "base/values.h"
#include "build/build_config.h"
#include "build/chromeos_buildflags.h"
@ -95,7 +95,7 @@ index 341fffbe509b5..678a0ed4d2b26 100644
#include "chrome/browser/browser_process.h"
#include "chrome/browser/pdf/pdf_extension_util.h"
#include "chrome/browser/policy/management_utils.h"
@@ -101,6 +102,13 @@ const char16_t kBasicPrintShortcut[] = u"(\u2325\u2318P)";
@@ -105,6 +106,13 @@ const char16_t kBasicPrintShortcut[] = u"(\u2325\u2318P)";
const char16_t kBasicPrintShortcut[] = u"(Ctrl+Shift+P)";
#endif
@ -109,7 +109,7 @@ index 341fffbe509b5..678a0ed4d2b26 100644
constexpr char kInvalidArgsForDidStartPreview[] =
"Invalid arguments for DidStartPreview";
constexpr char kInvalidPageNumberForDidPreviewPage[] =
@@ -285,7 +293,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
@@ -300,7 +308,7 @@ void AddPrintPreviewStrings(content::WebUIDataSource* source) {
source->AddLocalizedStrings(kLocalizedStrings);
#if !BUILDFLAG(IS_CHROMEOS)

2
patch/patches/printing_context_2196.patch
View File

@ -1,5 +1,5 @@
diff --git chrome/browser/printing/printer_query.cc chrome/browser/printing/printer_query.cc
index 0b6ff160cc053..987d9cf9b43c0 100644
index 83bce57ef52af..cb14470d16e4a 100644
--- chrome/browser/printing/printer_query.cc
+++ chrome/browser/printing/printer_query.cc
@@ -122,6 +122,7 @@ PrinterQuery::PrinterQuery(content::GlobalRenderFrameHostId rfh_id)

2
patch/patches/resource_bundle_2512.patch
View File

@ -1,5 +1,5 @@
diff --git ui/base/resource/resource_bundle.cc ui/base/resource/resource_bundle.cc
index c3ba9d2f8d60b..9ecc36cefb41c 100644
index 774f0b5289a4b..7e7f3a03e655c 100644
--- ui/base/resource/resource_bundle.cc
+++ ui/base/resource/resource_bundle.cc
@@ -934,6 +934,12 @@ ResourceBundle::ResourceBundle(Delegate* delegate)

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 c01cc787de463..9c09d462ce05e 100644
index fc773d1601a7f..bd1b616cd75cd 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 c01cc787de463..9c09d462ce05e 100644
}
absl::optional<DisplayFeature> RenderWidgetHostViewAura::GetDisplayFeature() {
@@ -2292,6 +2295,16 @@ void RenderWidgetHostViewAura::CreateAuraWindow(aura::client::WindowType type) {
@@ -2288,6 +2291,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_);

6
patch/patches/screen_1443650.patch
View File

@ -19,10 +19,10 @@ index b74a058c4034e..441ccadf6a729 100644
bool Screen::GetDisplayWithDisplayId(int64_t display_id,
diff --git ui/display/win/screen_win.cc ui/display/win/screen_win.cc
index 1bddf0a8b84b4..da4b443f5f5a9 100644
index ec87a93c5c91a..293485b488193 100644
--- ui/display/win/screen_win.cc
+++ ui/display/win/screen_win.cc
@@ -580,7 +580,7 @@ gfx::Rect ScreenWin::ScreenToDIPRect(HWND hwnd, const gfx::Rect& pixel_bounds) {
@@ -579,7 +579,7 @@ gfx::Rect ScreenWin::ScreenToDIPRect(HWND hwnd, const gfx::Rect& pixel_bounds) {
gfx::PointF(pixel_bounds.origin()), screen_win_display));
const float scale_factor =
1.0f / screen_win_display.display().device_scale_factor();
@ -31,7 +31,7 @@ index 1bddf0a8b84b4..da4b443f5f5a9 100644
}
// static
@@ -595,7 +595,7 @@ gfx::Rect ScreenWin::DIPToScreenRect(HWND hwnd, const gfx::Rect& dip_bounds) {
@@ -594,7 +594,7 @@ gfx::Rect ScreenWin::DIPToScreenRect(HWND hwnd, const gfx::Rect& dip_bounds) {
const gfx::Point origin =
display::win::DIPToScreenPoint(dip_bounds.origin(), screen_win_display);
const float scale_factor = screen_win_display.display().device_scale_factor();

59
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 319bb85903871..9cd291c0553ea 100644
index d4eaf8445a0cf..c4351e2afcf74 100644
--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
+++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
@@ -23,6 +23,7 @@
@ -10,7 +10,7 @@ index 319bb85903871..9cd291c0553ea 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"
@@ -247,6 +248,9 @@ bool ContentAnalysisDelegate::IsEnabled(Profile* profile,
@@ -248,6 +249,9 @@ bool ContentAnalysisDelegate::IsEnabled(Profile* profile,
GURL url,
Data* data,
AnalysisConnector connector) {
@ -21,7 +21,7 @@ index 319bb85903871..9cd291c0553ea 100644
// 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 2795ff21d23b8..68552c8e0ba40 100644
index a8843129e84f8..65c60b1c5eca5 100644
--- chrome/browser/net/profile_network_context_service.cc
+++ chrome/browser/net/profile_network_context_service.cc
@@ -22,6 +22,7 @@
@ -32,7 +32,7 @@ index 2795ff21d23b8..68552c8e0ba40 100644
#include "chrome/browser/browser_features.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/content_settings/cookie_settings_factory.h"
@@ -299,8 +300,10 @@ ProfileNetworkContextService::ProfileNetworkContextService(Profile* profile)
@@ -298,8 +299,10 @@ ProfileNetworkContextService::ProfileNetworkContextService(Profile* profile)
base::Unretained(this)));
cookie_settings_ = CookieSettingsFactory::GetForProfile(profile);
cookie_settings_observation_.Observe(cookie_settings_.get());
@ -45,8 +45,15 @@ index 2795ff21d23b8..68552c8e0ba40 100644
DisableQuicIfNotAllowed();
@@ -804,7 +807,19 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -794,9 +797,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
network_context_params->cookie_manager_params =
CreateCookieManagerParams(profile_, *cookie_settings_);
+ if (!in_memory) {
+ network_context_params->file_paths =
+ ::network::mojom::NetworkContextFilePaths::New();
+ }
+
// Configure on-disk storage for non-OTR profiles. OTR profiles just use
// default behavior (in memory storage, default sizes).
- if (!in_memory) {
@ -56,7 +63,7 @@ index 2795ff21d23b8..68552c8e0ba40 100644
+ const base::FilePath& base_cache_path =
+ prefs->GetFilePath(prefs::kDiskCacheDir);
+ DCHECK(!base_cache_path.empty());
+ network_context_params->http_cache_directory =
+ network_context_params->file_paths->http_cache_directory =
+ base_cache_path.Append(chrome::kCacheDirname);
+ network_context_params->http_cache_max_size =
+ prefs->GetInteger(prefs::kDiskCacheSize);
@ -66,18 +73,28 @@ index 2795ff21d23b8..68552c8e0ba40 100644
PrefService* local_state = g_browser_process->local_state();
// Configure the HTTP cache path and size.
base::FilePath base_cache_path;
@@ -818,7 +833,9 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
@@ -805,15 +825,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal(
local_state->GetFilePath(prefs::kDiskCacheDir);
if (!disk_cache_dir.empty())
base_cache_path = disk_cache_dir.Append(base_cache_path.BaseName());
+ network_context_params->file_paths->http_cache_directory =
+ base_cache_path.Append(chrome::kCacheDirname);
const int disk_cache_size = local_state->GetInteger(prefs::kDiskCacheSize);
network_context_params->http_cache_max_size = disk_cache_size;
network_context_params->shared_dictionary_cache_max_size = disk_cache_size;
+ }
- network_context_params->file_paths =
- ::network::mojom::NetworkContextFilePaths::New();
-
- network_context_params->file_paths->http_cache_directory =
- base_cache_path.Append(chrome::kCacheDirname);
+ if (!in_memory) {
network_context_params->file_paths =
::network::mojom::NetworkContextFilePaths::New();
network_context_params->file_paths->data_directory =
path.Append(chrome::kNetworkDataDirname);
network_context_params->file_paths->unsandboxed_data_path = path;
diff --git chrome/browser/signin/identity_manager_factory.cc chrome/browser/signin/identity_manager_factory.cc
index 9cf4c48627d33..23cf9f77b0ce2 100644
index 77522f65b7b6e..51cc2d60d4b8d 100644
--- chrome/browser/signin/identity_manager_factory.cc
+++ chrome/browser/signin/identity_manager_factory.cc
@@ -11,6 +11,7 @@
@ -97,7 +114,7 @@ index 9cf4c48627d33..23cf9f77b0ce2 100644
GetInstance()->GetServiceForBrowserContext(profile, true));
}
diff --git net/cookies/cookie_monster.cc net/cookies/cookie_monster.cc
index f8e822c0d54fe..2ec330cefe8fe 100644
index c2232a9d25f81..e60de1cba9df9 100644
--- net/cookies/cookie_monster.cc
+++ net/cookies/cookie_monster.cc
@@ -554,6 +554,25 @@ void CookieMonster::SetCookieableSchemes(
@ -127,7 +144,7 @@ index f8e822c0d54fe..2ec330cefe8fe 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 e4018759ec521..dd4a711ca4d3b 100644
index 6086953c99f55..bdec277059a97 100644
--- net/cookies/cookie_monster.h
+++ net/cookies/cookie_monster.h
@@ -208,6 +208,8 @@ class NET_EXPORT CookieMonster : public CookieStore {
@ -156,13 +173,13 @@ index 61fd008fc067e..73909be088278 100644
// reset to null.
const CookieAccessDelegate* cookie_access_delegate() const {
diff --git services/network/cookie_manager.cc services/network/cookie_manager.cc
index ba7f48e90026c..a509cc4565e9f 100644
index eb8a44a1e8ef9..4da584e1e179c 100644
--- services/network/cookie_manager.cc
+++ services/network/cookie_manager.cc
@@ -283,14 +283,9 @@ void CookieManager::FlushCookieStore(FlushCookieStoreCallback callback) {
void CookieManager::AllowFileSchemeCookies(
bool allow,
@@ -292,14 +292,9 @@ void CookieManager::AllowFileSchemeCookies(
AllowFileSchemeCookiesCallback callback) {
OnSettingsWillChange();
- std::vector<std::string> cookieable_schemes(
- net::CookieMonster::kDefaultCookieableSchemes,
- net::CookieMonster::kDefaultCookieableSchemes +
@ -178,10 +195,10 @@ index ba7f48e90026c..a509cc4565e9f 100644
void CookieManager::SetForceKeepSessionState() {
diff --git services/network/network_context.cc services/network/network_context.cc
index d553d31e90ca7..c27dc5a747aca 100644
index 1361678479bcf..636db3369c5cc 100644
--- services/network/network_context.cc
+++ services/network/network_context.cc
@@ -2349,16 +2349,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
@@ -2363,16 +2363,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext(
network_service_->network_quality_estimator());
}
@ -210,10 +227,10 @@ index d553d31e90ca7..c27dc5a747aca 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 bff25abd86e9d..114a818850751 100644
index 0be4cf9c74e82..387c3b133bef0 100644
--- services/network/public/mojom/network_context.mojom
+++ services/network/public/mojom/network_context.mojom
@@ -356,6 +356,9 @@ struct NetworkContextParams {
@@ -374,6 +374,9 @@ struct NetworkContextParams {
// cookies. Otherwise it should be false.
bool persist_session_cookies = false;

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 710d5ce9e029e..052c820aab988 100644
index 005de7ebb48f3..1ccc2fb5bd195 100644
--- content/browser/storage_partition_impl.cc
+++ content/browser/storage_partition_impl.cc
@@ -502,10 +502,6 @@ class LoginHandlerDelegate {
@@ -507,10 +507,6 @@ class LoginHandlerDelegate {
}
WebContents* web_contents = web_contents_getter_.Run();
@ -13,7 +13,7 @@ index 710d5ce9e029e..052c820aab988 100644
// WeakPtr is not strictly necessary here due to OnRequestCancelled.
creating_login_delegate_ = true;
@@ -557,12 +553,6 @@ void OnAuthRequiredContinuation(
@@ -562,12 +558,6 @@ void OnAuthRequiredContinuation(
mojo::PendingRemote<network::mojom::AuthChallengeResponder>
auth_challenge_responder,
base::RepeatingCallback<WebContents*(void)> web_contents_getter) {
@ -26,7 +26,7 @@ index 710d5ce9e029e..052c820aab988 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,
@@ -3119,8 +3109,12 @@ void StoragePartitionImpl::GetQuotaSettings(
@@ -3214,8 +3204,12 @@ void StoragePartitionImpl::GetQuotaSettings(
return;
}
@ -40,7 +40,7 @@ index 710d5ce9e029e..052c820aab988 100644
storage::GetDefaultDeviceInfoHelper(), std::move(callback));
}
@@ -3130,9 +3124,12 @@ void StoragePartitionImpl::InitNetworkContext() {
@@ -3225,9 +3219,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,8 +1,8 @@
diff --git ui/views/controls/webview/webview.cc ui/views/controls/webview/webview.cc
index ee170d7984eb3..f45d171d15ea3 100644
index 12f1c58c28a91..07cc49d755630 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,
@@ -144,6 +144,10 @@ void WebView::EnableSizingFromWebContents(const gfx::Size& min_size,
MaybeEnableAutoResize(web_contents()->GetPrimaryMainFrame());
}
@ -14,7 +14,7 @@ index ee170d7984eb3..f45d171d15ea3 100644
if (crashed_overlay_view_ == crashed_overlay_view)
return;
diff --git ui/views/controls/webview/webview.h ui/views/controls/webview/webview.h
index 2b7d528daf579..c71ff2a9c8dd3 100644
index 2c69bd3f2b62a..06c9ca5846c77 100644
--- ui/views/controls/webview/webview.h
+++ ui/views/controls/webview/webview.h
@@ -88,6 +88,10 @@ class WEBVIEW_EXPORT WebView : public View,

4
patch/patches/storage_incognito_2289.patch
View File

@ -13,7 +13,7 @@ index 01d2a426e2c17..c239a2f6fc786 100644
{base::MayBlock(), base::TaskPriority::USER_VISIBLE,
base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN});
diff --git content/browser/browser_context.cc content/browser/browser_context.cc
index e4a0c8a1a55b7..7e2e0e3b1b987 100644
index c07c16f62e3fb..25b4cd3e023e4 100644
--- content/browser/browser_context.cc
+++ content/browser/browser_context.cc
@@ -130,7 +130,7 @@ StoragePartition* BrowserContext::GetStoragePartition(
@ -25,7 +25,7 @@ index e4a0c8a1a55b7..7e2e0e3b1b987 100644
// An off the record profile MUST only use in memory storage partitions.
CHECK(storage_partition_config.in_memory());
}
@@ -365,7 +365,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
@@ -356,7 +356,8 @@ BrowserContext::CreateVideoDecodePerfHistory() {
const bool kUseInMemoryDBDefault = false;
bool use_in_memory_db = base::GetFieldTrialParamByFeatureAsBool(
media::kMediaCapabilitiesWithParameters, kUseInMemoryDBParamName,

38
patch/patches/views_1749_2102_3330.patch
View File

@ -119,10 +119,10 @@ index c1c0631071a11..aa2c01ebce43e 100644
friend class test::InkDropHostTestApi;
diff --git ui/views/controls/button/label_button.cc ui/views/controls/button/label_button.cc
index 3168220180af9..3ed7bec8438a2 100644
index d6f4bdecfb441..cb7467bc661ea 100644
--- ui/views/controls/button/label_button.cc
+++ ui/views/controls/button/label_button.cc
@@ -553,6 +553,12 @@ void LabelButton::OnThemeChanged() {
@@ -557,6 +557,12 @@ void LabelButton::OnThemeChanged() {
SchedulePaint();
}
@ -136,10 +136,10 @@ index 3168220180af9..3ed7bec8438a2 100644
Button::StateChanged(old_state);
ResetLabelEnabledColor();
diff --git ui/views/controls/button/label_button.h ui/views/controls/button/label_button.h
index e641dc163c5fc..785ccd20e4dd4 100644
index d1ef026687694..d7efbe0338065 100644
--- ui/views/controls/button/label_button.h
+++ ui/views/controls/button/label_button.h
@@ -150,6 +150,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
@@ -152,6 +152,9 @@ class VIEWS_EXPORT LabelButton : public Button, public NativeThemeDelegate {
ui::NativeTheme::State GetForegroundThemeState(
ui::NativeTheme::ExtraParams* params) const override;
@ -240,7 +240,7 @@ index 711dc633bffc2..0fa2626150de2 100644
std::unique_ptr<SelectionController> selection_controller_;
diff --git ui/views/controls/menu/menu_controller.cc ui/views/controls/menu/menu_controller.cc
index f8b3ded1dba82..86b9ddd90ee16 100644
index 7816e1fe32d9a..733a8c0c5cedf 100644
--- ui/views/controls/menu/menu_controller.cc
+++ ui/views/controls/menu/menu_controller.cc
@@ -563,7 +563,8 @@ void MenuController::Run(Widget* parent,
@ -261,7 +261,7 @@ index f8b3ded1dba82..86b9ddd90ee16 100644
// Only create a MenuPreTargetHandler for non-nested menus. Nested menus
// will use the existing one.
@@ -2239,6 +2241,7 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
@@ -2228,6 +2230,7 @@ void MenuController::OpenMenuImpl(MenuItemView* item, bool show) {
params.do_capture = do_capture;
params.native_view_for_gestures = native_view_for_gestures_;
params.owned_window_anchor = anchor;
@ -269,7 +269,7 @@ index f8b3ded1dba82..86b9ddd90ee16 100644
if (item->GetParentMenuItem()) {
params.context = item->GetWidget();
// (crbug.com/1414232) The item to be open is a submenu. Make sure
@@ -2943,8 +2946,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
@@ -2938,8 +2941,13 @@ MenuItemView* MenuController::FindInitialSelectableMenuItem(
void MenuController::OpenSubmenuChangeSelectionIfCan() {
MenuItemView* item = pending_state_.item;
@ -284,7 +284,7 @@ index f8b3ded1dba82..86b9ddd90ee16 100644
// Show the sub-menu.
SetSelection(item, SELECTION_OPEN_SUBMENU | SELECTION_UPDATE_IMMEDIATELY);
@@ -2964,8 +2972,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
@@ -2959,8 +2967,10 @@ void MenuController::OpenSubmenuChangeSelectionIfCan() {
void MenuController::CloseSubmenu() {
MenuItemView* item = state_.item;
DCHECK(item);
@ -297,10 +297,10 @@ index f8b3ded1dba82..86b9ddd90ee16 100644
SetSelection(item, SELECTION_UPDATE_IMMEDIATELY);
else if (item->GetParentMenuItem()->GetParentMenuItem())
diff --git ui/views/controls/menu/menu_controller.h ui/views/controls/menu/menu_controller.h
index e10b92be74908..59a12cab09536 100644
index 1334ad5a759dd..3ee525615683f 100644
--- ui/views/controls/menu/menu_controller.h
+++ ui/views/controls/menu/menu_controller.h
@@ -134,7 +134,9 @@ class VIEWS_EXPORT MenuController
@@ -140,7 +140,9 @@ class VIEWS_EXPORT MenuController
MenuAnchorPosition position,
bool context_menu,
bool is_nested_drag,
@ -311,7 +311,7 @@ index e10b92be74908..59a12cab09536 100644
bool for_drop() const { return for_drop_; }
@@ -703,6 +705,8 @@ class VIEWS_EXPORT MenuController
@@ -723,6 +725,8 @@ class VIEWS_EXPORT MenuController
// RunType::SEND_GESTURE_EVENTS_TO_OWNER is set.
gfx::NativeView native_view_for_gestures_ = gfx::NativeView();
@ -396,10 +396,10 @@ index c048ab2aa5ae4..810f62eed6676 100644
explicit MenuHost(SubmenuView* submenu);
diff --git ui/views/controls/menu/menu_item_view.cc ui/views/controls/menu/menu_item_view.cc
index f99daa29d9181..49b4a3da021ea 100644
index dd34e0072ffa7..d45ed6a33251c 100644
--- ui/views/controls/menu/menu_item_view.cc
+++ ui/views/controls/menu/menu_item_view.cc
@@ -1096,6 +1096,15 @@ void MenuItemView::PaintBackground(gfx::Canvas* canvas,
@@ -1087,6 +1087,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 f99daa29d9181..49b4a3da021ea 100644
} else if (paint_as_selected) {
gfx::Rect item_bounds = GetLocalBounds();
if (type_ == Type::kActionableSubMenu) {
@@ -1160,6 +1169,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
@@ -1151,6 +1160,13 @@ void MenuItemView::PaintMinorIconAndText(gfx::Canvas* canvas, SkColor color) {
}
SkColor MenuItemView::GetTextColor(bool minor, bool paint_as_selected) const {
@ -639,10 +639,10 @@ index e6587d2208a13..c2c72f7edb89c 100644
void Cancel() override;
base::TimeTicks GetClosingEventTime() const override;
diff --git ui/views/controls/menu/menu_runner_impl_cocoa.h ui/views/controls/menu/menu_runner_impl_cocoa.h
index 50291eb07440a..9716791a463aa 100644
index 68c01b93a973a..543c1bf139d4d 100644
--- ui/views/controls/menu/menu_runner_impl_cocoa.h
+++ ui/views/controls/menu/menu_runner_impl_cocoa.h
@@ -43,6 +43,7 @@ class VIEWS_EXPORT MenuRunnerImplCocoa : public MenuRunnerImplInterface {
@@ -46,6 +46,7 @@ class VIEWS_EXPORT MenuRunnerImplCocoa : public MenuRunnerImplInterface {
MenuAnchorPosition anchor,
int32_t run_types,
gfx::NativeView native_view_for_gestures,
@ -651,10 +651,10 @@ index 50291eb07440a..9716791a463aa 100644
void Cancel() override;
base::TimeTicks GetClosingEventTime() const override;
diff --git ui/views/controls/menu/menu_runner_impl_cocoa.mm ui/views/controls/menu/menu_runner_impl_cocoa.mm
index 46a50f5a808c3..689c7d3afb21c 100644
index 8bbf8104fdb46..ecbcd0f9ef3cc 100644
--- ui/views/controls/menu/menu_runner_impl_cocoa.mm
+++ ui/views/controls/menu/menu_runner_impl_cocoa.mm
@@ -193,6 +193,7 @@ void MenuRunnerImplCocoa::RunMenuAt(
@@ -194,6 +194,7 @@ void MenuRunnerImplCocoa::RunMenuAt(
MenuAnchorPosition anchor,
int32_t run_types,
gfx::NativeView native_view_for_gestures,
@ -716,7 +716,7 @@ index 187e55af5d7be..3a980d26fdaae 100644
#if !BUILDFLAG(IS_CHROMEOS_LACROS)
if (root_location != root_current_location &&
diff --git ui/views/view.h ui/views/view.h
index eec88617b7c9b..b5d77709d0bba 100644
index ffec4f9971210..b5f7d0aa3126c 100644
--- ui/views/view.h
+++ ui/views/view.h
@@ -21,6 +21,7 @@

34
patch/patches/views_widget.patch
View File

@ -1,8 +1,8 @@
diff --git content/browser/renderer_host/render_widget_host_view_base.cc content/browser/renderer_host/render_widget_host_view_base.cc
index d7ff9f7303d80..40aa86fe87638 100644
index f1d50fba17a0a..0ee633dfd0a9d 100644
--- content/browser/renderer_host/render_widget_host_view_base.cc
+++ content/browser/renderer_host/render_widget_host_view_base.cc
@@ -640,6 +640,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
@@ -641,6 +641,14 @@ float RenderWidgetHostViewBase::GetScaleOverrideForCapture() const {
return scale_override_for_capture_;
}
@ -152,10 +152,10 @@ index d7e649d5590ab..baff410b4e0c6 100644
// Set the view's active state (i.e., tint state of controls).
virtual void SetActive(bool active) = 0;
diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc
index 7ebbdf4700a63..0e09252466b82 100644
index 91d5863a7e241..5d804395a4cf0 100644
--- ui/ozone/platform/x11/x11_window.cc
+++ ui/ozone/platform/x11/x11_window.cc
@@ -1801,7 +1801,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
@@ -1802,7 +1802,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) {
req.border_pixel = 0;
bounds_in_pixels_ = SanitizeBounds(bounds);
@ -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 e589b36f45df8..6b25e64bee95a 100644
index 9b36a7639e0ac..06cd2b0fc662f 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -280,8 +280,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
@@ -285,8 +285,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) {
if (properties.parent_widget) {
window_parent_ = DesktopWindowTreeHostPlatform::GetHostForWidget(
properties.parent_widget);
@ -258,7 +258,7 @@ index e589b36f45df8..6b25e64bee95a 100644
// Calculate initial bounds.
diff --git ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
index 3d22d934c39f5..6d2066270e4b4 100644
index 53c1d25e3f56d..377ef1e646958 100644
--- ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -180,16 +180,28 @@ void DesktopWindowTreeHostWin::Init(const Widget::InitParams& params) {
@ -294,7 +294,7 @@ index 3d22d934c39f5..6d2066270e4b4 100644
message_handler_->Init(parent_hwnd, pixel_bounds, params.headless_mode);
CreateCompositor(params.force_software_compositing);
OnAcceleratedWidgetAvailable();
@@ -1036,11 +1048,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
@@ -1034,11 +1046,15 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
}
void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
@ -312,7 +312,7 @@ index 3d22d934c39f5..6d2066270e4b4 100644
}
bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
@@ -1048,6 +1064,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
@@ -1046,6 +1062,12 @@ bool DesktopWindowTreeHostWin::HandleMouseEvent(ui::MouseEvent* event) {
if (ui::PlatformEventSource::ShouldIgnoreNativePlatformEvents())
return true;
@ -325,7 +325,7 @@ index 3d22d934c39f5..6d2066270e4b4 100644
SendEventToSink(event);
return event->handled();
}
@@ -1226,8 +1248,16 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) {
@@ -1224,8 +1246,16 @@ void DesktopWindowTreeHostWin::SetBoundsInDIP(const gfx::Rect& bounds) {
// positions in variable-DPI situations. See https://crbug.com/1224715 for
// details.
aura::Window* root = nullptr;
@ -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 e3355509996d0..4cd3bd85ce94b 100644
index 2b52ad2f63bd6..db0059cc38055 100644
--- ui/views/widget/widget.cc
+++ ui/views/widget/widget.cc
@@ -368,7 +368,8 @@ void Widget::Init(InitParams params) {
@ -395,7 +395,7 @@ index e3355509996d0..4cd3bd85ce94b 100644
}
if (base::FeatureList::IsEnabled(features::kWidgetLayering)) {
@@ -1621,10 +1630,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
@@ -1605,10 +1614,16 @@ void Widget::OnNativeWidgetParentChanged(gfx::NativeView parent) {
}
gfx::Size Widget::GetMinimumSize() const {
@ -413,7 +413,7 @@ index e3355509996d0..4cd3bd85ce94b 100644
}
diff --git ui/views/widget/widget.h ui/views/widget/widget.h
index 62d8dc50f08f2..c4481a5002013 100644
index 51017b6f5dd9a..62fb61fc142ad 100644
--- ui/views/widget/widget.h
+++ ui/views/widget/widget.h
@@ -351,6 +351,8 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
@ -426,7 +426,7 @@ index 62d8dc50f08f2..c4481a5002013 100644
// the NativeWidget may specify a default size. If the parent is specified,
// |bounds| is in the parent's coordinate system. If the parent is not
diff --git ui/views/widget/widget_delegate.h ui/views/widget/widget_delegate.h
index 6d22d8f082c55..8a959d9aea0eb 100644
index cc74cc5f60ce1..d2698e765db76 100644
--- ui/views/widget/widget_delegate.h
+++ ui/views/widget/widget_delegate.h
@@ -375,6 +375,10 @@ class VIEWS_EXPORT WidgetDelegate
@ -455,10 +455,10 @@ index 3b9b00b7d79ae..e759e3c1a9f34 100644
if (native_widget_delegate->IsDialogBox()) {
*style |= DS_MODALFRAME;
diff --git ui/views/win/hwnd_message_handler.cc ui/views/win/hwnd_message_handler.cc
index 60e4436e29b8e..952ae51938ab4 100644
index bb3e9c6759cef..e3a83f0060dc3 100644
--- ui/views/win/hwnd_message_handler.cc
+++ ui/views/win/hwnd_message_handler.cc
@@ -940,8 +940,12 @@ bool HWNDMessageHandler::IsActive() const {
@@ -953,8 +953,12 @@ bool HWNDMessageHandler::IsActive() const {
// In headless mode return expected activation state instead of the
// actual one. This ensures that onfocus/onblur notifications work
// as expected and no unexpected throttling occurs.
@ -472,7 +472,7 @@ index 60e4436e29b8e..952ae51938ab4 100644
}
bool HWNDMessageHandler::IsMinimized() const {
@@ -3336,10 +3340,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
@@ -3339,10 +3343,13 @@ LRESULT HWNDMessageHandler::HandleMouseEventInternal(UINT message,
} else if (event.type() == ui::ET_MOUSEWHEEL) {
ui::MouseWheelEvent mouse_wheel_event(msg);
// Reroute the mouse wheel to the window under the pointer if applicable.

4
patch/patches/viz_osr_2575.patch
View File

@ -80,7 +80,7 @@ index 8af69cac78b74..9f74e511c263d 100644
private:
const HWND hwnd_;
diff --git components/viz/service/BUILD.gn components/viz/service/BUILD.gn
index ef3c8ba80dd34..1088d6e3c5797 100644
index 7d16c747af4b8..d42e3636c4101 100644
--- components/viz/service/BUILD.gn
+++ components/viz/service/BUILD.gn
@@ -228,6 +228,8 @@ viz_component("service") {
@ -191,7 +191,7 @@ index d63ec55ae38d6..ff86831efd68b 100644
// running in the same process, so it won't block anything.
// TODO(159346933) Remove once the origin isolation logic is moved outside of
diff --git services/viz/privileged/mojom/compositing/display_private.mojom services/viz/privileged/mojom/compositing/display_private.mojom
index 350fa67c49249..c03f924171720 100644
index 29936bca703b8..8ffe0f5509475 100644
--- services/viz/privileged/mojom/compositing/display_private.mojom
+++ services/viz/privileged/mojom/compositing/display_private.mojom
@@ -108,13 +108,15 @@ interface DisplayPrivate {

20
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 4efa2e72fdc34..1319dfa2c2b2f 100644
index 3c66272f91029..c7dab0ee2a534 100644
--- content/browser/web_contents/web_contents_impl.cc
+++ content/browser/web_contents/web_contents_impl.cc
@@ -3242,6 +3242,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3269,6 +3269,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 4efa2e72fdc34..1319dfa2c2b2f 100644
std::unique_ptr<WebContentsViewDelegate> delegate =
GetContentClient()->browser()->GetWebContentsViewDelegate(this);
@@ -3252,6 +3258,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
@@ -3279,6 +3285,7 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params,
view_ = CreateWebContentsView(this, std::move(delegate),
&render_view_host_delegate_view_);
}
@ -23,7 +23,7 @@ index 4efa2e72fdc34..1319dfa2c2b2f 100644
CHECK(render_view_host_delegate_view_);
CHECK(view_.get());
@@ -3441,6 +3448,9 @@ void WebContentsImpl::RenderWidgetCreated(
@@ -3468,6 +3475,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 4efa2e72fdc34..1319dfa2c2b2f 100644
}
void WebContentsImpl::RenderWidgetDeleted(
@@ -4170,6 +4180,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
@@ -4220,6 +4230,15 @@ FrameTree* WebContentsImpl::CreateNewWindow(
create_params.picture_in_picture_options = *(params.pip_options);
}
@ -49,7 +49,7 @@ index 4efa2e72fdc34..1319dfa2c2b2f 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.
@@ -8117,6 +8136,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
@@ -8155,6 +8174,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node,
// frames).
SetFocusedFrameTree(&node->frame_tree());
}
@ -60,7 +60,7 @@ index 4efa2e72fdc34..1319dfa2c2b2f 100644
void WebContentsImpl::DidCallFocus() {
diff --git content/public/browser/web_contents.h content/public/browser/web_contents.h
index ea1643f689885..6cf095a71303b 100644
index 71466f62c10d1..b55b37bbf8c9c 100644
--- content/public/browser/web_contents.h
+++ content/public/browser/web_contents.h
@@ -97,10 +97,12 @@ class BrowserContext;
@ -119,10 +119,10 @@ index c5bda327264c3..4b82e0c9ff345 100644
// typically happens when popups are created.
virtual void WebContentsCreated(WebContents* source_contents,
diff --git content/public/browser/web_contents_observer.h content/public/browser/web_contents_observer.h
index 9694d1854873e..ae7327bd8d80b 100644
index 73efe4a951d56..32ed509568c6c 100644
--- content/public/browser/web_contents_observer.h
+++ content/public/browser/web_contents_observer.h
@@ -220,6 +220,9 @@ class CONTENT_EXPORT WebContentsObserver {
@@ -224,6 +224,9 @@ class CONTENT_EXPORT WebContentsObserver {
virtual void OnCaptureHandleConfigUpdate(
const blink::mojom::CaptureHandleConfig& config) {}
@ -132,7 +132,7 @@ index 9694d1854873e..ae7327bd8d80b 100644
// This method is invoked when the `blink::WebView` of the current
// RenderViewHost is ready, e.g. because we recreated it after a crash.
virtual void RenderViewReady() {}
@@ -817,6 +820,10 @@ class CONTENT_EXPORT WebContentsObserver {
@@ -828,6 +831,10 @@ class CONTENT_EXPORT WebContentsObserver {
// WebContents has gained/lost focus.
virtual void OnFocusChangedInPage(FocusedNodeDetails* details) {}

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 2d99d8aff36e3..eafd224d24ed1 100644
index d5190a6875277..7446d5b936c32 100644
--- third_party/blink/public/platform/platform.h
+++ third_party/blink/public/platform/platform.h
@@ -775,6 +775,11 @@ class BLINK_PLATFORM_EXPORT Platform {
@@ -774,6 +774,11 @@ class BLINK_PLATFORM_EXPORT Platform {
}
#endif

8
patch/patches/webkit_popups.patch
View File

@ -11,10 +11,10 @@ index 8a18ecf567cd3..9697d43bbbfb9 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 3fd94156edd98..b5552b362519a 100644
index 980108560a9d0..0ae00d2c70526 100644
--- third_party/blink/renderer/core/exported/web_view_impl.cc
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -251,8 +251,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
@@ -250,8 +250,13 @@ void WebView::SetUseExternalPopupMenus(bool use_external_popup_menus) {
g_should_use_external_popup_menus = use_external_popup_menus;
}
@ -30,7 +30,7 @@ index 3fd94156edd98..b5552b362519a 100644
}
namespace {
@@ -572,6 +577,7 @@ WebViewImpl::WebViewImpl(
@@ -571,6 +576,7 @@ WebViewImpl::WebViewImpl(
chrome_client_(MakeGarbageCollected<ChromeClientImpl>(this)),
minimum_zoom_level_(PageZoomFactorToZoomLevel(kMinimumPageZoomFactor)),
maximum_zoom_level_(PageZoomFactorToZoomLevel(kMaximumPageZoomFactor)),
@ -62,7 +62,7 @@ index 6a180620e00c7..09d11bfd3c83f 100644
gfx::Transform device_emulation_transform_;
diff --git third_party/blink/renderer/core/page/chrome_client_impl.cc third_party/blink/renderer/core/page/chrome_client_impl.cc
index 8cb8e7c17836f..6f98ab3b61ebd 100644
index 37f49afb2d01c..3b6aef63e31fc 100644
--- third_party/blink/renderer/core/page/chrome_client_impl.cc
+++ third_party/blink/renderer/core/page/chrome_client_impl.cc
@@ -917,7 +917,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {

8
tools/gn_args.py
View File

@ -466,6 +466,11 @@ def GetConfigArgs(args, is_debug, cpu):
"""
add_args = {}
if platform == 'windows' and cpu == 'x86':
# Disable Rust dependencies for Windows x86 builds due to
# https://crbug.com/1465165.
add_args['enable_rust'] = False
# Cannot create is_official_build=true is_debug=true builds.
# This restriction is enforced in //build/config/BUILDCONFIG.gn.
# Instead, our "official Debug" build is a Release build with dchecks and
@ -512,6 +517,9 @@ def GetConfigArgsSandbox(platform, args, is_debug, cpu):
# Enable base target customizations necessary for distribution of the
# cef_sandbox static library.
'is_cef_sandbox_build': True,
# Disable Rust dependencies.
'enable_rust': False,
}
if platform == 'windows':