diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 5bc7158cd..4d45dc76c 100644 --- a/CHROMIUM_BUILD_COMPATIBILITY.txt +++ b/CHROMIUM_BUILD_COMPATIBILITY.txt @@ -7,5 +7,6 @@ # https://bitbucket.org/chromiumembedded/cef/wiki/BranchesAndBuilding { - 'chromium_checkout': 'refs/tags/124.0.6367.0' + 'chromium_checkout': 'refs/tags/124.0.6367.18', + 'depot_tools_checkout': 'a46e95ea68' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index c191d7a01..4901c21c3 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index 5daf5aba13046..f0922951ee2b3 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 52cdd617511bd..1d52c8473304c 100644 +index 5d4f3ab1c8328..725ad7e10cd2c 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -7966,10 +7966,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( +@@ -7940,10 +7940,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( bool use_opaque_origin = (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) == network::mojom::WebSandboxFlags::kOrigin; @@ -47,7 +47,7 @@ index 52cdd617511bd..1d52c8473304c 100644 } return origin_and_debug_info; -@@ -8077,6 +8089,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { +@@ -8051,6 +8063,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { DetermineInitiatorRelationship(initiator_rfh, frame_tree_node_->current_frame_host())); diff --git a/patch/patches/chrome_browser.patch b/patch/patches/chrome_browser.patch index bbeb19a35..da01b241a 100644 --- a/patch/patches/chrome_browser.patch +++ b/patch/patches/chrome_browser.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/BUILD.gn chrome/browser/BUILD.gn -index 5d698b969a134..ffddbc4db780b 100644 +index e382658efba86..1d1d57f1eb413 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") diff --git a/patch/patches/chrome_browser_policy.patch b/patch/patches/chrome_browser_policy.patch index 36cab1b59..d58f888c5 100644 --- a/patch/patches/chrome_browser_policy.patch +++ b/patch/patches/chrome_browser_policy.patch @@ -44,7 +44,7 @@ index 27af6ec08f593..156689eec644d 100644 #include "chrome/common/chrome_paths.h" namespace policy { -@@ -47,11 +48,6 @@ +@@ -47,11 +48,6 @@ const char kEnrollmentOptionsFilePath[] = FILE_PATH_LITERAL( "/Library/Google/Chrome/CloudManagementEnrollmentOptions"); const char kEnrollmentMandatoryOption[] = "Mandatory"; @@ -306,7 +306,7 @@ index 1a2e78c3472ec..5d1bd95a15113 100644 #include "components/policy/policy_constants.h" namespace policy::path_parser { -@@ -97,16 +98,12 @@ +@@ -97,16 +98,12 @@ base::FilePath::StringType ExpandPathVariables( void CheckUserDataDirPolicy(base::FilePath* user_data_dir) { // Since the configuration management infrastructure is not initialized when // this code runs, read the policy preference directly. diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index 1396a5505..b179028c0 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -384,7 +384,7 @@ index 2f0fe9d22667c..f50fe7bf75df3 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index 66b50cf0fd99b..f2e2cc47a513e 100644 +index 011ffe3477b67..7bc473463374c 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -47,6 +47,7 @@ @@ -416,7 +416,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -4375,9 +4383,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -4360,9 +4368,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -428,7 +428,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -6484,7 +6494,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -6469,7 +6479,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( #endif } @@ -437,7 +437,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -6502,6 +6512,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -6487,6 +6497,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -446,7 +446,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644 } std::vector -@@ -7627,10 +7639,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -7612,10 +7624,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -459,7 +459,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -7649,7 +7661,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -7634,7 +7646,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -469,7 +469,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -7789,7 +7802,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -7774,7 +7787,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { @@ -479,7 +479,7 @@ index 66b50cf0fd99b..f2e2cc47a513e 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 d8f6e1ea5f843..27172c75e4c3a 100644 +index 943300d211a0b..714227335ba8b 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h @@ -144,6 +144,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -491,7 +491,7 @@ index d8f6e1ea5f843..27172c75e4c3a 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. -@@ -681,7 +683,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -678,7 +680,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { override; void OnNetworkServiceCreated( network::mojom::NetworkService* network_service) override; @@ -500,7 +500,7 @@ index d8f6e1ea5f843..27172c75e4c3a 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1184,7 +1186,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -1181,7 +1183,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { #if !BUILDFLAG(IS_ANDROID) uint64_t num_keepalive_requests_ = 0; @@ -510,7 +510,7 @@ index d8f6e1ea5f843..27172c75e4c3a 100644 #endif diff --git chrome/browser/prefs/browser_prefs.cc chrome/browser/prefs/browser_prefs.cc -index 5eef5cdedda4c..d0c16b6d70585 100644 +index 9686c676b0f0b..527e696bfe16d 100644 --- chrome/browser/prefs/browser_prefs.cc +++ chrome/browser/prefs/browser_prefs.cc @@ -16,6 +16,7 @@ @@ -532,7 +532,7 @@ index 5eef5cdedda4c..d0c16b6d70585 100644 #if BUILDFLAG(ENABLE_EXTENSIONS) #include "chrome/browser/accessibility/animation_policy_prefs.h" #include "chrome/browser/apps/platform_apps/shortcut_manager.h" -@@ -1679,7 +1684,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1689,7 +1694,8 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) @@ -542,7 +542,7 @@ index 5eef5cdedda4c..d0c16b6d70585 100644 downgrade::RegisterPrefs(registry); #endif -@@ -1711,6 +1717,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1721,6 +1727,11 @@ void RegisterLocalState(PrefRegistrySimple* registry) { // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); @@ -554,7 +554,7 @@ index 5eef5cdedda4c..d0c16b6d70585 100644 } // Register prefs applicable to all profiles. -@@ -2145,6 +2156,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2155,6 +2166,10 @@ void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry, const std::string& locale) { RegisterProfilePrefs(registry, locale); diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 968559f32..233cab3bd 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -41,10 +41,10 @@ index 3bf48f1897c93..a9b219500beac 100644 bool BrowserCommandController::IsWebAppOrCustomTab() const { diff --git chrome/browser/ui/toolbar/app_menu_model.cc chrome/browser/ui/toolbar/app_menu_model.cc -index 8cdbf6a389727..715078e9d0a2c 100644 +index fe66065976b50..7f8c52acab103 100644 --- chrome/browser/ui/toolbar/app_menu_model.cc +++ chrome/browser/ui/toolbar/app_menu_model.cc -@@ -709,6 +709,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel( +@@ -723,6 +723,57 @@ SaveAndShareSubMenuModel::SaveAndShareSubMenuModel( } } @@ -102,7 +102,7 @@ index 8cdbf6a389727..715078e9d0a2c 100644 } // namespace //////////////////////////////////////////////////////////////////////////////// -@@ -1571,7 +1622,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { +@@ -1585,7 +1636,7 @@ bool AppMenuModel::IsCommandIdChecked(int command_id) const { return false; } @@ -111,7 +111,7 @@ index 8cdbf6a389727..715078e9d0a2c 100644 GlobalError* error = GlobalErrorServiceFactory::GetForProfile(browser_->profile()) ->GetGlobalErrorByMenuItemCommandID(command_id); -@@ -1586,6 +1637,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { +@@ -1600,6 +1651,30 @@ bool AppMenuModel::IsCommandIdEnabled(int command_id) const { } } @@ -142,7 +142,7 @@ index 8cdbf6a389727..715078e9d0a2c 100644 bool AppMenuModel::IsCommandIdAlerted(int command_id) const { if (command_id == IDC_VIEW_PASSWORDS || command_id == IDC_SHOW_PASSWORD_MANAGER) { -@@ -1753,11 +1828,15 @@ void AppMenuModel::Build() { +@@ -1767,11 +1842,15 @@ void AppMenuModel::Build() { kDefaultIconSize)); } @@ -163,7 +163,7 @@ index 8cdbf6a389727..715078e9d0a2c 100644 AddItemWithStringId(IDC_PRINT, IDS_PRINT); -@@ -1870,9 +1949,13 @@ void AppMenuModel::Build() { +@@ -1884,9 +1963,13 @@ void AppMenuModel::Build() { kMoreToolsMenuItem); if (!features::IsChromeRefresh2023()) { @@ -180,7 +180,7 @@ index 8cdbf6a389727..715078e9d0a2c 100644 } if (!features::IsChromeRefresh2023()) { -@@ -1961,6 +2044,11 @@ void AppMenuModel::Build() { +@@ -1975,6 +2058,11 @@ void AppMenuModel::Build() { SetCommandIcon(this, IDC_EXIT, kExitMenuIcon); } diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 79612f6b8..ce578827e 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -47,10 +47,10 @@ index a6312cc67ff70..bcf78a6fbf59d 100644 return std::make_pair( /*is_cacheable=*/false, diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index f697700af13bb..a4ff32f2357b6 100644 +index 465de2f945f3a..fff39070d626f 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc -@@ -1087,7 +1087,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( +@@ -1080,7 +1080,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( void ContentBrowserClient::OnNetworkServiceCreated( network::mojom::NetworkService* network_service) {} @@ -59,7 +59,7 @@ index f697700af13bb..a4ff32f2357b6 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1096,6 +1096,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( +@@ -1089,6 +1089,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( cert_verifier_creation_params) { network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = "en-us,en"; @@ -68,10 +68,10 @@ index f697700af13bb..a4ff32f2357b6 100644 std::vector diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 6135759cb7f39..6c1a6fc6c5f76 100644 +index 9e1cf142f77d2..8cf7e530681c7 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h -@@ -2056,7 +2056,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2045,7 +2045,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. @@ -80,7 +80,7 @@ index 6135759cb7f39..6c1a6fc6c5f76 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -2277,6 +2277,21 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2266,6 +2266,21 @@ class CONTENT_EXPORT ContentBrowserClient { RenderFrameHost* initiator_document, mojo::PendingRemote* out_factory); @@ -102,7 +102,7 @@ index 6135759cb7f39..6c1a6fc6c5f76 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. -@@ -2334,6 +2349,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2323,6 +2338,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct(); diff --git a/patch/patches/content_main_654986.patch b/patch/patches/content_main_654986.patch index 6380e30e2..a6cf7de6d 100644 --- a/patch/patches/content_main_654986.patch +++ b/patch/patches/content_main_654986.patch @@ -12,7 +12,7 @@ index 79ba3ac1913f8..46bcb4366d2f8 100644 if (main_argv) setproctitle_init(main_argv); diff --git content/app/content_main.cc content/app/content_main.cc -index ffbb5986ca997..9f77c4603bf55 100644 +index ffbb5986ca997..3c24cb27d3c12 100644 --- content/app/content_main.cc +++ content/app/content_main.cc @@ -175,11 +175,8 @@ ContentMainParams::~ContentMainParams() = default; diff --git a/patch/patches/rfh_navigation_4829483.patch b/patch/patches/rfh_navigation_4829483.patch index a9523678e..ec079717b 100644 --- a/patch/patches/rfh_navigation_4829483.patch +++ b/patch/patches/rfh_navigation_4829483.patch @@ -1,8 +1,8 @@ diff --git content/browser/renderer_host/render_frame_host_impl.cc content/browser/renderer_host/render_frame_host_impl.cc -index 6066f87e7d50d..410f3a20f19f4 100644 +index 2e40dedd1e7ed..8a7ff210d5849 100644 --- content/browser/renderer_host/render_frame_host_impl.cc +++ content/browser/renderer_host/render_frame_host_impl.cc -@@ -10537,6 +10537,7 @@ void RenderFrameHostImpl::CommitNavigation( +@@ -10539,6 +10539,7 @@ void RenderFrameHostImpl::CommitNavigation( auto browser_calc_origin_to_commit = navigation_request->GetOriginToCommitWithDebugInfo(); if (!process_lock.is_error_page() && !is_mhtml_subframe && diff --git a/patch/patches/services_network_2718.patch b/patch/patches/services_network_2718.patch index bdc79552e..258688f43 100644 --- a/patch/patches/services_network_2718.patch +++ b/patch/patches/services_network_2718.patch @@ -1,8 +1,8 @@ diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc -index 80d9b70bf76b3..d9b8d78f6aa01 100644 +index 733ac0ebce185..5f18ff341abdb 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc -@@ -3282,8 +3282,12 @@ void StoragePartitionImpl::GetQuotaSettings( +@@ -3281,8 +3281,12 @@ void StoragePartitionImpl::GetQuotaSettings( return; } @@ -16,7 +16,7 @@ index 80d9b70bf76b3..d9b8d78f6aa01 100644 storage::GetDefaultDeviceInfoHelper(), std::move(callback)); } -@@ -3293,9 +3297,12 @@ void StoragePartitionImpl::InitNetworkContext() { +@@ -3292,9 +3296,12 @@ void StoragePartitionImpl::InitNetworkContext() { cert_verifier::mojom::CertVerifierCreationParamsPtr cert_verifier_creation_params = cert_verifier::mojom::CertVerifierCreationParams::New(); diff --git a/patch/patches/storage_incognito_2289.patch b/patch/patches/storage_incognito_2289.patch index 217d64a60..3acbd65a6 100644 --- a/patch/patches/storage_incognito_2289.patch +++ b/patch/patches/storage_incognito_2289.patch @@ -13,10 +13,10 @@ 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 9f955ab67a071..80f911e8157dd 100644 +index 147a2bd8f36ab..041289eda7b09 100644 --- content/browser/browser_context.cc +++ content/browser/browser_context.cc -@@ -130,7 +130,7 @@ StoragePartition* BrowserContext::GetStoragePartition( +@@ -129,7 +129,7 @@ StoragePartition* BrowserContext::GetStoragePartition( StoragePartition* BrowserContext::GetStoragePartition( const StoragePartitionConfig& storage_partition_config, bool can_create) { @@ -25,7 +25,7 @@ index 9f955ab67a071..80f911e8157dd 100644 // An off the record profile MUST only use in memory storage partitions. CHECK(storage_partition_config.in_memory()); } -@@ -364,7 +364,8 @@ BrowserContext::CreateVideoDecodePerfHistory() { +@@ -356,7 +356,8 @@ BrowserContext::CreateVideoDecodePerfHistory() { const bool kUseInMemoryDBDefault = false; bool use_in_memory_db = base::GetFieldTrialParamByFeatureAsBool( media::kMediaCapabilitiesWithParameters, kUseInMemoryDBParamName, @@ -58,10 +58,10 @@ index e82cdd66a2d5c..1816b2fe54ff5 100644 // static diff --git storage/browser/database/database_tracker.cc storage/browser/database/database_tracker.cc -index ad1fa4396cd65..1c5027cc0c922 100644 +index 872bf7d1671bb..b87bb299316f2 100644 --- storage/browser/database/database_tracker.cc +++ storage/browser/database/database_tracker.cc -@@ -569,7 +569,7 @@ bool DatabaseTracker::LazyInit() { +@@ -559,7 +559,7 @@ bool DatabaseTracker::LazyInit() { databases_table_ = std::make_unique(db_.get()); meta_table_ = std::make_unique(); diff --git a/patch/patches/views_widget.patch b/patch/patches/views_widget.patch index 30b1f5b9f..2c5cf4eb5 100644 --- a/patch/patches/views_widget.patch +++ b/patch/patches/views_widget.patch @@ -258,10 +258,10 @@ index 6076597470af9..871147e3e3a84 100644 // Specifies which edges of the window are tiled. diff --git ui/ozone/platform/x11/x11_window.cc ui/ozone/platform/x11/x11_window.cc -index a5656cefbfc57..aeb062df96e39 100644 +index b0e5657075aa3..05e7adf77c09b 100644 --- ui/ozone/platform/x11/x11_window.cc +++ ui/ozone/platform/x11/x11_window.cc -@@ -1863,7 +1863,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) { +@@ -1870,7 +1870,8 @@ void X11Window::CreateXWindow(const PlatformWindowInitProperties& properties) { req.border_pixel = 0; bounds_in_pixels_ = SanitizeBounds(bounds); @@ -349,7 +349,7 @@ index 3151a2c872f4e..e14caeb1e6645 100644 base::WeakPtrFactory 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 c5379f421f5be..f49896ef092cf 100644 +index e5b246b988c50..117af4ea74b16 100644 --- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc @@ -293,8 +293,8 @@ void DesktopWindowTreeHostPlatform::Init(const Widget::InitParams& params) { diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index b3e8b4bb5..c78cfffcb 100644 --- a/patch/patches/web_contents_1257_1565.patch +++ b/patch/patches/web_contents_1257_1565.patch @@ -1,5 +1,5 @@ diff --git content/browser/web_contents/web_contents_impl.cc content/browser/web_contents/web_contents_impl.cc -index bfb696d17099c..e1213ba481460 100644 +index a3074afab8867..d3cfac7d2cad0 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -3521,6 +3521,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -33,7 +33,7 @@ index bfb696d17099c..e1213ba481460 100644 } void WebContentsImpl::RenderWidgetDeleted( -@@ -4549,6 +4559,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -4550,6 +4560,15 @@ FrameTree* WebContentsImpl::CreateNewWindow( create_params.picture_in_picture_options = *(params.pip_options); } @@ -49,7 +49,7 @@ index bfb696d17099c..e1213ba481460 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. -@@ -8820,6 +8839,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, +@@ -8821,6 +8840,9 @@ void WebContentsImpl::SetFocusedFrame(FrameTreeNode* node, } CloseListenerManager::DidChangeFocusedFrame(this); @@ -119,7 +119,7 @@ index c44ef9991cbb0..316fe9f68a9d2 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 ede7dc0581064..d434670d4cb4c 100644 +index 2176bcc3adc34..d2d893d7481c0 100644 --- content/public/browser/web_contents_observer.h +++ content/public/browser/web_contents_observer.h @@ -227,6 +227,9 @@ class CONTENT_EXPORT WebContentsObserver : public base::CheckedObserver {