diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt index 65f56aeb2..7fede8b6a 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/120.0.6099.0' + 'chromium_checkout': 'refs/tags/120.0.6099.35', + 'depot_tools_checkout': 'f01ca5848d' } diff --git a/patch/patches/browser_security_policy_1081397.patch b/patch/patches/browser_security_policy_1081397.patch index 4a88c25d5..fa578fd64 100644 --- a/patch/patches/browser_security_policy_1081397.patch +++ b/patch/patches/browser_security_policy_1081397.patch @@ -20,10 +20,10 @@ index 401eb0cd40ee2..5e7ac0b6d9d0a 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 159a0e1c17214..0a65b3b75b158 100644 +index 0eed5d5e1bc86..688e192e773c6 100644 --- content/browser/renderer_host/navigation_request.cc +++ content/browser/renderer_host/navigation_request.cc -@@ -7457,10 +7457,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( +@@ -7468,10 +7468,22 @@ NavigationRequest::GetOriginForURLLoaderFactoryBeforeResponseWithDebugInfo( bool use_opaque_origin = (sandbox_flags & network::mojom::WebSandboxFlags::kOrigin) == network::mojom::WebSandboxFlags::kOrigin; @@ -47,7 +47,7 @@ index 159a0e1c17214..0a65b3b75b158 100644 } return origin_and_debug_info; -@@ -7565,6 +7577,15 @@ NavigationRequest::GetOriginForURLLoaderFactoryAfterResponseWithDebugInfo() { +@@ -7576,6 +7588,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 db1a92460..5c504571a 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 bce36d7ffb408..33fdb680fb20a 100644 +index 44d3b5e543101..09b095cffd89e 100644 --- chrome/browser/BUILD.gn +++ chrome/browser/BUILD.gn @@ -11,6 +11,7 @@ import("//build/config/compiler/pgo/pgo.gni") @@ -20,7 +20,7 @@ index bce36d7ffb408..33fdb680fb20a 100644 flags += [ "ENABLE_PROCESS_SINGLETON=0" ] } else { flags += [ "ENABLE_PROCESS_SINGLETON=1" ] -@@ -2073,6 +2075,7 @@ static_library("browser") { +@@ -2075,6 +2077,7 @@ static_library("browser") { "//build/config/chromebox_for_meetings:buildflags", "//build/config/compiler:compiler_buildflags", "//cc", @@ -28,7 +28,7 @@ index bce36d7ffb408..33fdb680fb20a 100644 "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", -@@ -2729,6 +2732,10 @@ static_library("browser") { +@@ -2731,6 +2734,10 @@ static_library("browser") { ] } diff --git a/patch/patches/chrome_browser_browser.patch b/patch/patches/chrome_browser_browser.patch index 6c3f97c0a..d984c001a 100644 --- a/patch/patches/chrome_browser_browser.patch +++ b/patch/patches/chrome_browser_browser.patch @@ -75,7 +75,7 @@ index 169b2041595fe..a5d3ec34d36bd 100644 } diff --git chrome/browser/ui/BUILD.gn chrome/browser/ui/BUILD.gn -index 83bb8314906d5..0970f80bf9ae8 100644 +index c860d165db483..c567e63476d02 100644 --- chrome/browser/ui/BUILD.gn +++ chrome/browser/ui/BUILD.gn @@ -9,6 +9,7 @@ import("//build/config/compiler/compiler.gni") @@ -105,7 +105,7 @@ index 83bb8314906d5..0970f80bf9ae8 100644 "//chrome:resources", "//chrome:strings", "//chrome/app:chrome_dll_resources", -@@ -2810,6 +2816,8 @@ static_library("ui") { +@@ -2812,6 +2818,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", @@ -114,7 +114,7 @@ index 83bb8314906d5..0970f80bf9ae8 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", -@@ -4768,8 +4776,6 @@ static_library("ui") { +@@ -4770,8 +4778,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", @@ -123,7 +123,7 @@ index 83bb8314906d5..0970f80bf9ae8 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", -@@ -6494,6 +6500,7 @@ static_library("ui") { +@@ -6496,6 +6502,7 @@ static_library("ui") { if (enable_printing) { deps += [ "//components/printing/browser", @@ -132,7 +132,7 @@ index 83bb8314906d5..0970f80bf9ae8 100644 ] } diff --git chrome/browser/ui/browser.cc chrome/browser/ui/browser.cc -index bd2f3d64f3f38..7f70339454e16 100644 +index ea0fb984ecb5a..316b4dd9a701e 100644 --- chrome/browser/ui/browser.cc +++ chrome/browser/ui/browser.cc @@ -264,6 +264,25 @@ @@ -301,7 +301,7 @@ index bd2f3d64f3f38..7f70339454e16 100644 void Browser::BeforeUnloadFired(WebContents* web_contents, bool proceed, bool* proceed_to_fire_unload) { -@@ -1924,6 +2009,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, +@@ -1931,6 +2016,10 @@ void Browser::WebContentsCreated(WebContents* source_contents, // Make the tab show up in the task manager. task_manager::WebContentsTags::CreateForTabContents(new_contents); @@ -312,7 +312,7 @@ index bd2f3d64f3f38..7f70339454e16 100644 } void Browser::PortalWebContentsCreated(WebContents* portal_web_contents) { -@@ -2080,11 +2169,15 @@ void Browser::EnterFullscreenModeForTab( +@@ -2087,11 +2176,15 @@ void Browser::EnterFullscreenModeForTab( const blink::mojom::FullscreenOptions& options) { exclusive_access_manager_->fullscreen_controller()->EnterFullscreenModeForTab( requesting_frame, options.display_id); @@ -328,7 +328,7 @@ index bd2f3d64f3f38..7f70339454e16 100644 } bool Browser::IsFullscreenForTabOrPending(const WebContents* web_contents) { -@@ -2277,6 +2370,15 @@ void Browser::RequestMediaAccessPermission( +@@ -2284,6 +2377,15 @@ void Browser::RequestMediaAccessPermission( content::WebContents* web_contents, const content::MediaStreamRequest& request, content::MediaResponseCallback callback) { @@ -344,7 +344,7 @@ index bd2f3d64f3f38..7f70339454e16 100644 const extensions::Extension* extension = GetExtensionForOrigin(profile_, request.security_origin); MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( -@@ -2828,9 +2930,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { +@@ -2835,9 +2937,11 @@ void Browser::RemoveScheduledUpdatesFor(WebContents* contents) { // Browser, Getters for UI (private): StatusBubble* Browser::GetStatusBubble() { @@ -357,7 +357,7 @@ index bd2f3d64f3f38..7f70339454e16 100644 } // We hide the status bar for web apps windows as this matches native -@@ -2838,6 +2942,12 @@ StatusBubble* Browser::GetStatusBubble() { +@@ -2845,6 +2949,12 @@ StatusBubble* Browser::GetStatusBubble() { // mode, as the minimal browser UI includes the status bar. if (web_app::AppBrowserController::IsWebApp(this) && !app_controller()->HasMinimalUiButtons()) { @@ -370,7 +370,7 @@ index bd2f3d64f3f38..7f70339454e16 100644 return nullptr; } -@@ -2974,6 +3084,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { +@@ -2981,6 +3091,8 @@ void Browser::SetAsDelegate(WebContents* web_contents, bool set_delegate) { BookmarkTabHelper::FromWebContents(web_contents)->RemoveObserver(this); web_contents_collection_.StopObserving(web_contents); } @@ -379,7 +379,7 @@ index bd2f3d64f3f38..7f70339454e16 100644 } void Browser::TabDetachedAtImpl(content::WebContents* contents, -@@ -3128,6 +3240,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature( +@@ -3135,6 +3247,14 @@ bool Browser::PictureInPictureBrowserSupportsWindowFeature( bool Browser::SupportsWindowFeatureImpl(WindowFeature feature, bool check_can_support) const { @@ -395,7 +395,7 @@ index bd2f3d64f3f38..7f70339454e16 100644 case TYPE_NORMAL: return NormalBrowserSupportsWindowFeature(feature, check_can_support); diff --git chrome/browser/ui/browser.h chrome/browser/ui/browser.h -index 6544740362683..976a0e375a1f1 100644 +index f6efb82abb4ff..f0efbf7abb041 100644 --- chrome/browser/ui/browser.h +++ chrome/browser/ui/browser.h @@ -22,6 +22,7 @@ @@ -480,7 +480,7 @@ index 6544740362683..976a0e375a1f1 100644 void BeforeUnloadFired(content::WebContents* source, bool proceed, bool* proceed_to_fire_unload) override; -@@ -1227,6 +1262,10 @@ class Browser : public TabStripModelObserver, +@@ -1228,6 +1263,10 @@ class Browser : public TabStripModelObserver, // This Browser's window. raw_ptr window_; @@ -491,7 +491,7 @@ index 6544740362683..976a0e375a1f1 100644 std::unique_ptr const tab_strip_model_delegate_; std::unique_ptr const tab_strip_model_; -@@ -1296,6 +1335,8 @@ class Browser : public TabStripModelObserver, +@@ -1297,6 +1336,8 @@ class Browser : public TabStripModelObserver, const std::string initial_workspace_; bool initial_visible_on_all_workspaces_state_; diff --git a/patch/patches/chrome_browser_context_menus.patch b/patch/patches/chrome_browser_context_menus.patch index c3d46596a..d52949b47 100644 --- a/patch/patches/chrome_browser_context_menus.patch +++ b/patch/patches/chrome_browser_context_menus.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/renderer_context_menu/render_view_context_menu.cc chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 0aa9c67c292a6..bbc8e6900a494 100644 +index 030c189448eea..81976a5b1bfd6 100644 --- chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -352,6 +352,13 @@ base::OnceCallback* GetMenuShownCallback() { @@ -27,7 +27,7 @@ index 0aa9c67c292a6..bbc8e6900a494 100644 id = CollapseCommandsForUMA(id); const auto& map = GetIdcToUmaMap(type); auto it = map.find(id); -@@ -829,6 +840,14 @@ RenderViewContextMenu::RenderViewContextMenu( +@@ -828,6 +839,14 @@ RenderViewContextMenu::RenderViewContextMenu( pdf_ocr_submenu_model_ = std::make_unique(this); #endif // BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) @@ -42,7 +42,7 @@ index 0aa9c67c292a6..bbc8e6900a494 100644 observers_.AddObserver(&autofill_context_menu_manager_); } -@@ -1289,6 +1308,12 @@ void RenderViewContextMenu::InitMenu() { +@@ -1288,6 +1307,12 @@ void RenderViewContextMenu::InitMenu() { autofill::PopupHidingReason::kContextMenuOpened); } } @@ -55,7 +55,7 @@ index 0aa9c67c292a6..bbc8e6900a494 100644 } Profile* RenderViewContextMenu::GetProfile() const { -@@ -3376,6 +3401,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( +@@ -3375,6 +3400,12 @@ void RenderViewContextMenu::RegisterExecutePluginActionCallbackForTesting( execute_plugin_action_callback_ = std::move(cb); } diff --git a/patch/patches/chrome_runtime.patch b/patch/patches/chrome_runtime.patch index d17456b58..49aba74ca 100644 --- a/patch/patches/chrome_runtime.patch +++ b/patch/patches/chrome_runtime.patch @@ -364,7 +364,7 @@ index a509d0b37e953..0d48c4a1f1daf 100644 +#endif } diff --git chrome/browser/chrome_content_browser_client.cc chrome/browser/chrome_content_browser_client.cc -index c4d9748b5cc7c..f897335534e00 100644 +index e79a38b20252c..16787d04426f2 100644 --- chrome/browser/chrome_content_browser_client.cc +++ chrome/browser/chrome_content_browser_client.cc @@ -43,6 +43,7 @@ @@ -375,7 +375,7 @@ index c4d9748b5cc7c..f897335534e00 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" -@@ -1542,6 +1543,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() { +@@ -1543,6 +1544,8 @@ ChromeContentBrowserClient::GetPopupNavigationDelegateFactoryForTesting() { } ChromeContentBrowserClient::ChromeContentBrowserClient() { @@ -384,7 +384,7 @@ index c4d9748b5cc7c..f897335534e00 100644 #if BUILDFLAG(ENABLE_PLUGINS) extra_parts_.push_back( std::make_unique()); -@@ -1574,6 +1577,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { +@@ -1575,6 +1578,11 @@ ChromeContentBrowserClient::~ChromeContentBrowserClient() { } } @@ -396,7 +396,7 @@ index c4d9748b5cc7c..f897335534e00 100644 // static void ChromeContentBrowserClient::RegisterLocalStatePrefs( PrefRegistrySimple* registry) { -@@ -4457,9 +4465,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( +@@ -4482,9 +4490,11 @@ void ChromeContentBrowserClient::BrowserURLHandlerCreated( &search::HandleNewTabURLReverseRewrite); #endif // BUILDFLAG(IS_ANDROID) @@ -408,7 +408,7 @@ index c4d9748b5cc7c..f897335534e00 100644 } base::FilePath ChromeContentBrowserClient::GetDefaultDownloadDirectory() { -@@ -6530,7 +6540,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( +@@ -6567,7 +6577,7 @@ void ChromeContentBrowserClient::OnNetworkServiceCreated( #endif } @@ -417,7 +417,7 @@ index c4d9748b5cc7c..f897335534e00 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -6548,6 +6558,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( +@@ -6585,6 +6595,8 @@ void ChromeContentBrowserClient::ConfigureNetworkContextParams( network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = GetApplicationLocale(); } @@ -426,7 +426,7 @@ index c4d9748b5cc7c..f897335534e00 100644 } std::vector -@@ -7661,10 +7673,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( +@@ -7698,10 +7710,10 @@ void ChromeContentBrowserClient::OnKeepaliveRequestStarted( const auto now = base::TimeTicks::Now(); const auto timeout = GetKeepaliveTimerTimeout(context); keepalive_deadline_ = std::max(keepalive_deadline_, now + timeout); @@ -439,7 +439,7 @@ index c4d9748b5cc7c..f897335534e00 100644 FROM_HERE, keepalive_deadline_ - now, base::BindOnce( &ChromeContentBrowserClient::OnKeepaliveTimerFired, -@@ -7683,7 +7695,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { +@@ -7720,7 +7732,8 @@ void ChromeContentBrowserClient::OnKeepaliveRequestFinished() { --num_keepalive_requests_; if (num_keepalive_requests_ == 0) { DVLOG(1) << "Stopping the keepalive timer"; @@ -449,7 +449,7 @@ index c4d9748b5cc7c..f897335534e00 100644 // This deletes the keep alive handle attached to the timer function and // unblock the shutdown sequence. } -@@ -7825,7 +7838,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( +@@ -7862,7 +7875,7 @@ void ChromeContentBrowserClient::OnKeepaliveTimerFired( const auto now = base::TimeTicks::Now(); const auto then = keepalive_deadline_; if (now < then) { @@ -459,7 +459,7 @@ index c4d9748b5cc7c..f897335534e00 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 db4ede8eb28c8..a5ca9f6c57826 100644 +index 7c47a56574e7a..390c47f95f725 100644 --- chrome/browser/chrome_content_browser_client.h +++ chrome/browser/chrome_content_browser_client.h @@ -136,6 +136,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { @@ -471,7 +471,7 @@ index db4ede8eb28c8..a5ca9f6c57826 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. -@@ -654,7 +656,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -660,7 +662,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { override; void OnNetworkServiceCreated( network::mojom::NetworkService* network_service) override; @@ -480,7 +480,7 @@ index db4ede8eb28c8..a5ca9f6c57826 100644 content::BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1098,7 +1100,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -1109,7 +1111,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { #if !BUILDFLAG(IS_ANDROID) uint64_t num_keepalive_requests_ = 0; diff --git a/patch/patches/chrome_runtime_views.patch b/patch/patches/chrome_runtime_views.patch index 959749be8..9f40eb5f9 100644 --- a/patch/patches/chrome_runtime_views.patch +++ b/patch/patches/chrome_runtime_views.patch @@ -1,5 +1,5 @@ diff --git chrome/browser/ui/browser_command_controller.cc chrome/browser/ui/browser_command_controller.cc -index 6fa2a2fdfe48f..eadee5fa295e6 100644 +index 7d57988659286..576550dd75111 100644 --- chrome/browser/ui/browser_command_controller.cc +++ chrome/browser/ui/browser_command_controller.cc @@ -400,6 +400,7 @@ bool BrowserCommandController::ExecuteCommandWithDisposition( @@ -24,7 +24,7 @@ index 6fa2a2fdfe48f..eadee5fa295e6 100644 // The order of commands in this switch statement must match the function // declaration order in browser.h! switch (id) { -@@ -1169,11 +1177,13 @@ void BrowserCommandController::TabRestoreServiceLoaded( +@@ -1172,11 +1180,13 @@ void BrowserCommandController::TabRestoreServiceLoaded( // BrowserCommandController, private: bool BrowserCommandController::IsShowingMainUI() { @@ -363,7 +363,7 @@ index 0c231b6ac5b01..6b5af98e18e42 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 5ad7ca507f70c..1d195633a21db 100644 +index 7931768402968..0de6d2560575f 100644 --- chrome/browser/ui/views/frame/browser_view.cc +++ chrome/browser/ui/views/frame/browser_view.cc @@ -342,11 +342,10 @@ using content::NativeWebKeyboardEvent; @@ -493,7 +493,7 @@ index 5ad7ca507f70c..1d195633a21db 100644 if (auto* download_button = toolbar_button_provider_->GetDownloadButton()) return download_button->bubble_controller(); return nullptr; -@@ -3611,7 +3640,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { +@@ -3614,7 +3643,8 @@ void BrowserView::ReparentTopContainerForEndOfImmersive() { if (top_container()->parent() == this) return; @@ -503,7 +503,7 @@ index 5ad7ca507f70c..1d195633a21db 100644 top_container()->DestroyLayer(); AddChildViewAt(top_container(), 0); EnsureFocusOrder(); -@@ -4073,11 +4103,38 @@ void BrowserView::GetAccessiblePanes(std::vector* panes) { +@@ -4076,11 +4106,38 @@ void BrowserView::GetAccessiblePanes(std::vector* panes) { bool BrowserView::ShouldDescendIntoChildForEventHandling( gfx::NativeView child, const gfx::Point& location) { @@ -544,7 +544,7 @@ index 5ad7ca507f70c..1d195633a21db 100644 // Draggable regions are defined relative to the web contents. gfx::Point point_in_contents_web_view_coords(location); views::View::ConvertPointToTarget(GetWidget()->GetRootView(), -@@ -4086,7 +4143,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling( +@@ -4089,7 +4146,7 @@ bool BrowserView::ShouldDescendIntoChildForEventHandling( // Draggable regions should be ignored for clicks into any browser view's // owned widgets, for example alerts, permission prompts or find bar. @@ -553,7 +553,7 @@ index 5ad7ca507f70c..1d195633a21db 100644 point_in_contents_web_view_coords.x(), point_in_contents_web_view_coords.y()) || WidgetOwnedByAnchorContainsPoint(point_in_contents_web_view_coords); -@@ -4194,8 +4251,10 @@ void BrowserView::Layout() { +@@ -4197,8 +4254,10 @@ void BrowserView::Layout() { // TODO(jamescook): Why was this in the middle of layout code? toolbar_->location_bar()->omnibox_view()->SetFocusBehavior( @@ -566,7 +566,7 @@ index 5ad7ca507f70c..1d195633a21db 100644 #if BUILDFLAG(IS_CHROMEOS_ASH) // In chromeOS ash we round the bottom two corners of the browser frame by -@@ -4273,6 +4332,11 @@ void BrowserView::AddedToWidget() { +@@ -4276,6 +4335,11 @@ void BrowserView::AddedToWidget() { SetThemeProfileForWindow(GetNativeWindow(), browser_->profile()); #endif @@ -578,7 +578,7 @@ index 5ad7ca507f70c..1d195633a21db 100644 toolbar_->Init(); // TODO(pbos): Investigate whether the side panels should be creatable when -@@ -4321,13 +4385,9 @@ void BrowserView::AddedToWidget() { +@@ -4324,13 +4388,9 @@ void BrowserView::AddedToWidget() { EnsureFocusOrder(); @@ -594,7 +594,7 @@ index 5ad7ca507f70c..1d195633a21db 100644 using_native_frame_ = frame_->ShouldUseNativeFrame(); MaybeInitializeWebUITabStrip(); -@@ -4747,7 +4807,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, +@@ -4750,7 +4810,8 @@ void BrowserView::ProcessFullscreen(bool fullscreen, // Undo our anti-jankiness hacks and force a re-layout. in_process_fullscreen_ = false; ToolbarSizeChanged(false); @@ -604,7 +604,7 @@ index 5ad7ca507f70c..1d195633a21db 100644 } bool BrowserView::ShouldUseImmersiveFullscreenForUrl(const GURL& url) const { -@@ -5136,6 +5197,8 @@ Profile* BrowserView::GetProfile() { +@@ -5139,6 +5200,8 @@ Profile* BrowserView::GetProfile() { } void BrowserView::UpdateUIForTabFullscreen() { @@ -613,7 +613,7 @@ index 5ad7ca507f70c..1d195633a21db 100644 frame()->GetFrameView()->UpdateFullscreenTopUI(); } -@@ -5158,6 +5221,8 @@ void BrowserView::HideDownloadShelf() { +@@ -5161,6 +5224,8 @@ void BrowserView::HideDownloadShelf() { } bool BrowserView::CanUserExitFullscreen() const { @@ -623,7 +623,7 @@ index 5ad7ca507f70c..1d195633a21db 100644 } diff --git chrome/browser/ui/views/frame/browser_view.h chrome/browser/ui/views/frame/browser_view.h -index d6d8db2ed2341..c200381042cc9 100644 +index 7538090d415a7..25c7f80a5f4f4 100644 --- chrome/browser/ui/views/frame/browser_view.h +++ chrome/browser/ui/views/frame/browser_view.h @@ -137,11 +137,16 @@ class BrowserView : public BrowserWindow, @@ -643,7 +643,7 @@ index d6d8db2ed2341..c200381042cc9 100644 void set_frame(BrowserFrame* frame) { frame_ = frame; paint_as_active_subscription_ = -@@ -826,6 +831,9 @@ class BrowserView : public BrowserWindow, +@@ -829,6 +834,9 @@ class BrowserView : public BrowserWindow, // TopContainerBackground::PaintThemeCustomImage for details. gfx::Point GetThemeOffsetFromBrowserView() const; @@ -803,7 +803,7 @@ index ca602db58de3a..1db448a2526a4 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 50c887cc242fd..99428cb8eeda2 100644 +index 9536b049aeb9d..30f3091939675 100644 --- chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -558,29 +558,41 @@ gfx::Range BrowserTabStripController::ListTabsInGroup( @@ -849,10 +849,10 @@ index 50c887cc242fd..99428cb8eeda2 100644 } diff --git chrome/browser/ui/views/toolbar/toolbar_view.cc chrome/browser/ui/views/toolbar/toolbar_view.cc -index 503fe3b9c17ec..9c3be45b4699b 100644 +index bd6ff6fce989a..7e36aa6df6655 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.cc +++ chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -192,7 +192,7 @@ class TabstripLikeBackground : public views::Background { +@@ -194,7 +194,7 @@ class TabstripLikeBackground : public views::Background { void Paint(gfx::Canvas* canvas, views::View* view) const override { bool painted = TopContainerBackground::PaintThemeCustomImage(canvas, view, browser_view_); @@ -861,7 +861,7 @@ index 503fe3b9c17ec..9c3be45b4699b 100644 SkColor frame_color = browser_view_->frame()->GetFrameView()->GetFrameColor( BrowserFrameActiveState::kUseCurrent); -@@ -221,12 +221,13 @@ END_METADATA +@@ -223,12 +223,13 @@ END_METADATA //////////////////////////////////////////////////////////////////////////////// // ToolbarView, public: @@ -877,7 +877,7 @@ index 503fe3b9c17ec..9c3be45b4699b 100644 SetID(VIEW_ID_TOOLBAR); container_view_ = AddChildView(std::make_unique()); -@@ -251,6 +252,19 @@ ToolbarView::~ToolbarView() { +@@ -253,6 +254,19 @@ ToolbarView::~ToolbarView() { } void ToolbarView::Init() { @@ -897,7 +897,7 @@ index 503fe3b9c17ec..9c3be45b4699b 100644 #if defined(USE_AURA) // Avoid generating too many occlusion tracking calculation events before this // function returns. The occlusion status will be computed only once once this -@@ -275,12 +289,13 @@ void ToolbarView::Init() { +@@ -277,12 +291,13 @@ void ToolbarView::Init() { auto location_bar = std::make_unique( browser_, browser_->profile(), browser_->command_controller(), this, @@ -913,7 +913,7 @@ index 503fe3b9c17ec..9c3be45b4699b 100644 download_button = std::make_unique(browser_view_); } -@@ -362,8 +377,10 @@ void ToolbarView::Init() { +@@ -364,8 +379,10 @@ void ToolbarView::Init() { } } std::unique_ptr cast; @@ -925,7 +925,7 @@ index 503fe3b9c17ec..9c3be45b4699b 100644 std::unique_ptr media_button; if (base::FeatureList::IsEnabled(media::kGlobalMediaControls)) { -@@ -373,7 +390,8 @@ void ToolbarView::Init() { +@@ -375,7 +392,8 @@ void ToolbarView::Init() { std::unique_ptr send_tab_to_self_button; @@ -935,7 +935,7 @@ index 503fe3b9c17ec..9c3be45b4699b 100644 send_tab_to_self_button = std::make_unique( browser_view_); -@@ -444,7 +462,8 @@ void ToolbarView::Init() { +@@ -446,7 +464,8 @@ void ToolbarView::Init() { send_tab_to_self_button_ = container_view_->AddChildView(std::move(send_tab_to_self_button)); @@ -946,7 +946,7 @@ index 503fe3b9c17ec..9c3be45b4699b 100644 side_panel_container_ = container_view_->AddChildView( std::make_unique(browser_view_)); diff --git chrome/browser/ui/views/toolbar/toolbar_view.h chrome/browser/ui/views/toolbar/toolbar_view.h -index 8411945c45330..0d50479ec2cdc 100644 +index 3bfe52cff3511..11373de4c2a3a 100644 --- chrome/browser/ui/views/toolbar/toolbar_view.h +++ chrome/browser/ui/views/toolbar/toolbar_view.h @@ -92,7 +92,8 @@ class ToolbarView : public views::AccessiblePaneView, diff --git a/patch/patches/content_2015.patch b/patch/patches/content_2015.patch index 6e540669f..143e33c7b 100644 --- a/patch/patches/content_2015.patch +++ b/patch/patches/content_2015.patch @@ -12,10 +12,10 @@ index 34cacda8ef225..e0465b8ac1185 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 75cc859b67292..6b565adaef9c7 100644 +index 19f6f2a31b7ad..a2214012ce641 100644 --- content/browser/loader/navigation_url_loader_impl.cc +++ content/browser/loader/navigation_url_loader_impl.cc -@@ -752,6 +752,22 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() { +@@ -753,6 +753,22 @@ NavigationURLLoaderImpl::PrepareForNonInterceptedRequest() { : nullptr, &loader_factory); @@ -39,10 +39,10 @@ index 75cc859b67292..6b565adaef9c7 100644 factory = base::MakeRefCounted( std::move(loader_factory)); diff --git content/public/browser/content_browser_client.cc content/public/browser/content_browser_client.cc -index dcdc54f90f114..cc4d517b22809 100644 +index 86e81bb8b922c..63bff74ab4621 100644 --- content/public/browser/content_browser_client.cc +++ content/public/browser/content_browser_client.cc -@@ -1067,7 +1067,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( +@@ -1077,7 +1077,7 @@ ContentBrowserClient::CreateURLLoaderHandlerForServiceWorkerNavigationPreload( void ContentBrowserClient::OnNetworkServiceCreated( network::mojom::NetworkService* network_service) {} @@ -51,7 +51,7 @@ index dcdc54f90f114..cc4d517b22809 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -1076,6 +1076,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( +@@ -1086,6 +1086,7 @@ void ContentBrowserClient::ConfigureNetworkContextParams( cert_verifier_creation_params) { network_context_params->user_agent = GetUserAgentBasedOnPolicy(context); network_context_params->accept_language = "en-us,en"; @@ -60,7 +60,7 @@ index dcdc54f90f114..cc4d517b22809 100644 std::vector diff --git content/public/browser/content_browser_client.h content/public/browser/content_browser_client.h -index 06e22b37dfbce..95f433c7c2a5e 100644 +index 5298101d6dbf0..510ea90a8b186 100644 --- content/public/browser/content_browser_client.h +++ content/public/browser/content_browser_client.h @@ -40,6 +40,7 @@ @@ -71,7 +71,7 @@ index 06e22b37dfbce..95f433c7c2a5e 100644 #include "content/public/common/alternative_error_page_override_info.mojom-forward.h" #include "content/public/common/page_visibility_state.h" #include "content/public/common/window_container_type.mojom-forward.h" -@@ -1961,7 +1962,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1991,7 +1992,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 06e22b37dfbce..95f433c7c2a5e 100644 BrowserContext* context, bool in_memory, const base::FilePath& relative_partition_path, -@@ -2175,6 +2176,19 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2205,6 +2206,19 @@ class CONTENT_EXPORT ContentBrowserClient { RenderFrameHost* initiator_document, mojo::PendingRemote* out_factory); @@ -100,7 +100,7 @@ index 06e22b37dfbce..95f433c7c2a5e 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. -@@ -2232,6 +2246,10 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -2262,6 +2276,10 @@ class CONTENT_EXPORT ContentBrowserClient { // Used as part of the user agent string. virtual std::string GetProduct(); diff --git a/patch/patches/net_cookie_flags.patch b/patch/patches/net_cookie_flags.patch index dc9c38145..7eb6de85e 100644 --- a/patch/patches/net_cookie_flags.patch +++ b/patch/patches/net_cookie_flags.patch @@ -10,10 +10,10 @@ index 17b1395583e24..9b41b21f42b1f 100644 +// This load will not send any cookies. For CEF usage. +LOAD_FLAG(DO_NOT_SEND_COOKIES, 1 << 20) diff --git net/url_request/url_request_http_job.cc net/url_request/url_request_http_job.cc -index 689818d34e56e..c4d897053b7e4 100644 +index fee80f24bbd37..828908071f210 100644 --- net/url_request/url_request_http_job.cc +++ net/url_request/url_request_http_job.cc -@@ -1808,7 +1808,8 @@ bool URLRequestHttpJob::ShouldAddCookieHeader() const { +@@ -1856,7 +1856,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. diff --git a/patch/patches/services_network_2622.patch b/patch/patches/services_network_2622.patch index 93768fbb8..c8d34b0c1 100644 --- a/patch/patches/services_network_2622.patch +++ b/patch/patches/services_network_2622.patch @@ -21,7 +21,7 @@ index 0a6c1f498b8fc..79e0cf27a7715 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 9a777bb144d00..b6eeebc040351 100644 +index 392127630de15..af90e3a3e970d 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 9a777bb144d00..b6eeebc040351 100644 #include "chrome/browser/browser_features.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/content_settings/cookie_settings_factory.h" -@@ -272,8 +273,10 @@ ProfileNetworkContextService::ProfileNetworkContextService(Profile* profile) +@@ -273,8 +274,10 @@ ProfileNetworkContextService::ProfileNetworkContextService(Profile* profile) base::Unretained(this))); cookie_settings_ = CookieSettingsFactory::GetForProfile(profile); cookie_settings_observation_.Observe(cookie_settings_.get()); @@ -45,7 +45,7 @@ index 9a777bb144d00..b6eeebc040351 100644 DisableQuicIfNotAllowed(); -@@ -442,6 +445,9 @@ void ProfileNetworkContextService::OnTruncatedCookieBlockingChanged() { +@@ -455,6 +458,9 @@ void ProfileNetworkContextService::OnTruncatedCookieBlockingChanged() { void ProfileNetworkContextService::OnFirstPartySetsEnabledChanged( bool enabled) { @@ -55,7 +55,7 @@ index 9a777bb144d00..b6eeebc040351 100644 // Update all FPS Access Delegates on the FPS service to be `enabled`. first_party_sets::FirstPartySetsPolicyServiceFactory::GetForBrowserContext( profile_) -@@ -817,9 +823,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -833,9 +839,26 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( network_context_params->cookie_manager_params = CreateCookieManagerParams(profile_, *cookie_settings_); @@ -83,7 +83,7 @@ index 9a777bb144d00..b6eeebc040351 100644 PrefService* local_state = g_browser_process->local_state(); // Configure the HTTP cache path and size. base::FilePath base_cache_path; -@@ -828,15 +851,14 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -844,15 +867,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()); @@ -103,7 +103,7 @@ index 9a777bb144d00..b6eeebc040351 100644 network_context_params->file_paths->data_directory = path.Append(chrome::kNetworkDataDirname); network_context_params->file_paths->unsandboxed_data_path = path; -@@ -989,6 +1011,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -1005,6 +1027,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( network_context_params->block_trust_tokens = anti_abuse_content_setting == CONTENT_SETTING_BLOCK; @@ -111,7 +111,7 @@ index 9a777bb144d00..b6eeebc040351 100644 network_context_params->first_party_sets_access_delegate_params = network::mojom::FirstPartySetsAccessDelegateParams::New(); network_context_params->first_party_sets_access_delegate_params->enabled = -@@ -1005,6 +1028,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( +@@ -1021,6 +1044,7 @@ void ProfileNetworkContextService::ConfigureNetworkContextParamsInternal( GetForBrowserContext(profile_); DCHECK(fps_service); fps_service->AddRemoteAccessDelegate(std::move(fps_access_delegate_remote)); @@ -223,7 +223,7 @@ 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 bcc62a6f41379..b0e052349ad35 100644 +index bd5a6ed1377da..5c53f834b49b3 100644 --- services/network/cookie_manager.cc +++ services/network/cookie_manager.cc @@ -303,14 +303,9 @@ void CookieManager::AllowFileSchemeCookies( @@ -245,10 +245,10 @@ index bcc62a6f41379..b0e052349ad35 100644 void CookieManager::SetForceKeepSessionState() { diff --git services/network/network_context.cc services/network/network_context.cc -index 344fb45470747..100c815cf3db4 100644 +index 735c165f95e43..7d04642a3cd6d 100644 --- services/network/network_context.cc +++ services/network/network_context.cc -@@ -2528,16 +2528,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( +@@ -2530,16 +2530,20 @@ URLRequestContextOwner NetworkContext::MakeURLRequestContext( network_service_->network_quality_estimator()); } @@ -277,7 +277,7 @@ index 344fb45470747..100c815cf3db4 100644 base::FeatureList::IsEnabled(features::kFledgePst)) { trust_token_store_ = std::make_unique(); diff --git services/network/public/mojom/network_context.mojom services/network/public/mojom/network_context.mojom -index 88fc9ddba7fff..9a50865fa2d14 100644 +index e696f8197cd9f..a5bef1a7e532a 100644 --- services/network/public/mojom/network_context.mojom +++ services/network/public/mojom/network_context.mojom @@ -371,6 +371,9 @@ struct NetworkContextParams { diff --git a/patch/patches/services_network_2718.patch b/patch/patches/services_network_2718.patch index 204ddbc14..d7fd333ab 100644 --- a/patch/patches/services_network_2718.patch +++ b/patch/patches/services_network_2718.patch @@ -1,5 +1,5 @@ diff --git content/browser/storage_partition_impl.cc content/browser/storage_partition_impl.cc -index 4efe86694c37f..143c1411338c3 100644 +index b363364dc0648..4b71e10ffe997 100644 --- content/browser/storage_partition_impl.cc +++ content/browser/storage_partition_impl.cc @@ -543,10 +543,6 @@ class LoginHandlerDelegate { @@ -26,7 +26,7 @@ index 4efe86694c37f..143c1411338c3 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, -@@ -3333,8 +3323,12 @@ void StoragePartitionImpl::GetQuotaSettings( +@@ -3332,8 +3322,12 @@ void StoragePartitionImpl::GetQuotaSettings( return; } @@ -40,7 +40,7 @@ index 4efe86694c37f..143c1411338c3 100644 storage::GetDefaultDeviceInfoHelper(), std::move(callback)); } -@@ -3344,9 +3338,12 @@ void StoragePartitionImpl::InitNetworkContext() { +@@ -3343,9 +3337,12 @@ void StoragePartitionImpl::InitNetworkContext() { cert_verifier::mojom::CertVerifierCreationParamsPtr cert_verifier_creation_params = cert_verifier::mojom::CertVerifierCreationParams::New(); diff --git a/patch/patches/web_contents_1257_1565.patch b/patch/patches/web_contents_1257_1565.patch index 0f3157447..364852055 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 eab88872f0cee..de1775aa46b7d 100644 +index 63eafd910dad5..1abd7d266c244 100644 --- content/browser/web_contents/web_contents_impl.cc +++ content/browser/web_contents/web_contents_impl.cc @@ -3448,6 +3448,12 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params, @@ -99,7 +99,7 @@ index 3707858d0af59..58f794f35608a 100644 // the value that'll be returned by GetLastActiveTime(). If this is left // default initialized then the value is not passed on to the WebContents diff --git content/public/browser/web_contents_delegate.h content/public/browser/web_contents_delegate.h -index a3da78805b9bc..982e63aee498b 100644 +index 253f028c108b2..81fb346dae241 100644 --- content/public/browser/web_contents_delegate.h +++ content/public/browser/web_contents_delegate.h @@ -59,9 +59,11 @@ class EyeDropperListener;