Fix duplicate open from DevTools when handling OnOpenURLFromTab (fixes #3735)

This commit is contained in:
Marshall Greenblatt 2024-07-11 14:31:51 -04:00
parent b281f7aefd
commit 162c3d60df
2 changed files with 20 additions and 2 deletions

View File

@ -233,6 +233,10 @@ patches = [
# Fix fatal error: 'components/printing/common/print.mojom.h' file not found
# From chrome/browser/ui/browser_commands.cc via
# chrome/browser/printing/print_view_manager_common.h
#
# Avoid duplicate window from DevTools when CEF handles the open via
# OnOpenURLFromTab.
# https://github.com/chromiumembedded/cef/issues/3735
'name': 'chrome_browser_browser',
},
{

View File

@ -13,7 +13,7 @@ index 2480282a19d12..dbd1fbf8a15b5 100644
return false;
}
diff --git chrome/browser/devtools/devtools_window.cc chrome/browser/devtools/devtools_window.cc
index e857e2363da9e..3dd4db8ae4267 100644
index e857e2363da9e..e3ed4ad6048bc 100644
--- chrome/browser/devtools/devtools_window.cc
+++ chrome/browser/devtools/devtools_window.cc
@@ -37,6 +37,7 @@
@ -38,7 +38,21 @@ index e857e2363da9e..3dd4db8ae4267 100644
}
// Create WebContents with devtools.
@@ -1916,12 +1924,28 @@ void DevToolsWindow::CreateDevToolsBrowser() {
@@ -1751,9 +1759,13 @@ void DevToolsWindow::OpenInNewTab(const GURL& url) {
if (!inspected_web_contents ||
!inspected_web_contents->OpenURL(params,
/*navigation_handle_callback=*/{})) {
+#if !BUILDFLAG(ENABLE_CEF)
+ // Remove default behavior when CEF handles the open via OnOpenURLFromTab.
+ // See CEF issue #3735.
chrome::ScopedTabbedBrowserDisplayer displayer(profile_);
chrome::AddSelectedTabWithURL(displayer.browser(), fixed_url,
ui::PAGE_TRANSITION_LINK);
+#endif
}
}
@@ -1916,12 +1928,28 @@ void DevToolsWindow::CreateDevToolsBrowser() {
Browser::CreationStatus::kOk) {
return;
}