From 2201028eaf066a412cd13c5f3c2641150bacf039 Mon Sep 17 00:00:00 2001
From: Nik Pavlov <npavlov@spotify.com>
Date: Mon, 18 Dec 2023 18:26:31 +0000
Subject: [PATCH] chrome: Fix unintended show of minimized window on navigation
 (fixes #3618)

---
 libcef/browser/frame_host_impl.cc     |  1 +
 tests/ceftests/navigation_unittest.cc | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/libcef/browser/frame_host_impl.cc b/libcef/browser/frame_host_impl.cc
index bb9767fb5..33c53dc54 100644
--- a/libcef/browser/frame_host_impl.cc
+++ b/libcef/browser/frame_host_impl.cc
@@ -376,6 +376,7 @@ void CefFrameHostImpl::LoadURLWithExtras(const std::string& url,
           gurl, referrer, WindowOpenDisposition::CURRENT_TAB, transition,
           /*is_renderer_initiated=*/false);
       params.extra_headers = extra_headers;
+      params.user_gesture = false;
 
       browser->LoadMainFrameURL(params);
     }
diff --git a/tests/ceftests/navigation_unittest.cc b/tests/ceftests/navigation_unittest.cc
index b1693fc19..3662f8542 100644
--- a/tests/ceftests/navigation_unittest.cc
+++ b/tests/ceftests/navigation_unittest.cc
@@ -1713,6 +1713,10 @@ const char kLoadNavCrossOrigin2[] = "https://tests-conav2.com/nav2.html";
 const char kLoadNavMsg[] = "NavigationTest.LoadNav";
 const char kLoadNavTestCmdKey[] = "nav-load-test";
 
+bool IsInitialUrl(const CefString& url) {
+  return url == kLoadNav1;
+}
+
 // Renderer side.
 class LoadNavRendererTest : public ClientAppRenderer::Delegate,
                             public CefLoadHandler {
@@ -1853,8 +1857,7 @@ class LoadNavTestHandler : public TestHandler {
       return;
     }
 
-    std::string url = browser->GetMainFrame()->GetURL();
-    if (url == kLoadNav1) {
+    if (IsInitialUrl(browser->GetMainFrame()->GetURL())) {
       // Verify the behavior of the previous load.
       EXPECT_TRUE(got_before_browse_);
       EXPECT_TRUE(got_before_resource_load_);
@@ -1927,23 +1930,18 @@ class LoadNavTestHandler : public TestHandler {
                       bool user_gesture,
                       bool is_redirect) override {
     EXPECT_EQ(RT_MAIN_FRAME, request->GetResourceType());
-    if (mode_ == LOAD || request->GetURL() == kLoadNav1) {
+    if (mode_ == LOAD || IsInitialUrl(request->GetURL())) {
       EXPECT_EQ(kTransitionExplicitLoad, request->GetTransitionType());
       if (IsChromeRuntimeEnabled()) {
         // With the Chrome runtime this is true on initial navigation via
-        // chrome::AddTabAt() and also true for clicked links.
-        EXPECT_TRUE(user_gesture);
+        // chrome::AddTabAt()
+        EXPECT_EQ(user_gesture, IsInitialUrl(request->GetURL()));
       } else {
         EXPECT_FALSE(user_gesture);
       }
     } else {
       EXPECT_EQ(ExpectedOpenURLTransitionType(), request->GetTransitionType());
-
-      if (mode_ == LEFT_CLICK || IsChromeRuntimeEnabled()) {
-        EXPECT_TRUE(user_gesture);
-      } else {
-        EXPECT_FALSE(user_gesture);
-      }
+      EXPECT_EQ(user_gesture, mode_ == LEFT_CLICK);
     }
 
     EXPECT_GT(browser_id_current_, 0);
@@ -2011,7 +2009,7 @@ class LoadNavTestHandler : public TestHandler {
     EXPECT_EQ(RT_MAIN_FRAME, request->GetResourceType());
 
     const auto transition_type = request->GetTransitionType();
-    if (mode_ == LOAD || request->GetURL() == kLoadNav1) {
+    if (mode_ == LOAD || IsInitialUrl(request->GetURL())) {
       EXPECT_EQ(kTransitionExplicitLoad, transition_type);
     } else {
       EXPECT_EQ(ExpectedOpenURLTransitionType(), transition_type);
@@ -2031,7 +2029,7 @@ class LoadNavTestHandler : public TestHandler {
     EXPECT_GT(browser_id_current_, 0);
     EXPECT_EQ(browser_id_current_, browser->GetIdentifier());
 
-    if (mode_ == LOAD || frame->GetURL() == kLoadNav1) {
+    if (mode_ == LOAD || IsInitialUrl(frame->GetURL())) {
       EXPECT_EQ(kTransitionExplicitLoad, transition_type);
     } else {
       EXPECT_EQ(ExpectedOpenURLTransitionType(), transition_type);