1 files changed, 14 insertions, 13 deletions

diff --git a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
index 9a31082..9271f55 100644
--- a/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
+++ b/www/chromium-uc/patches/extra/ungoogled-chromium/add-flag-to-convert-popups-to-tabs.patch
@@ -1,8 +1,8 @@
 # Make popups go to tabs instead
 
---- chrome/browser/ungoogled_flag_entries.h.orig
-+++ chrome/browser/ungoogled_flag_entries.h
-@@ -56,4 +56,8 @@
+--- a/chrome/browser/ungoogled_flag_entries.h
++++ b/chrome/browser/ungoogled_flag_entries.h
+@@ -48,4 +48,8 @@
       "Close window with last tab",
       "Determines whether a window should close once the last tab is closed.  ungoogled-chromium flag.",
       kOsDesktop, MULTI_VALUE_TYPE(kCloseWindowWithLastTab)},
@@ -11,19 +11,20 @@
 +     "Makes popups open in new tabs.  ungoogled-chromium flag",
 +     kOsAll, SINGLE_VALUE_TYPE("popups-to-tabs")},
  #endif  // CHROME_BROWSER_UNGOOGLED_FLAG_ENTRIES_H_
---- content/renderer/render_view_impl.cc.orig
-+++ content/renderer/render_view_impl.cc
-@@ -73,6 +73,8 @@ WindowOpenDisposition RenderViewImpl::Na
+--- a/content/renderer/render_view_impl.cc
++++ b/content/renderer/render_view_impl.cc
+@@ -75,6 +75,9 @@ WindowOpenDisposition RenderViewImpl::Na
      case blink::kWebNavigationPolicyNewWindow:
        return WindowOpenDisposition::NEW_WINDOW;
      case blink::kWebNavigationPolicyNewPopup:
 +      if (base::CommandLine::ForCurrentProcess()->HasSwitch("popups-to-tabs"))
 +        return WindowOpenDisposition::NEW_FOREGROUND_TAB;
++      return WindowOpenDisposition::NEW_POPUP;
+     case blink::kWebNavigationPolicyPictureInPicture:
        return WindowOpenDisposition::NEW_POPUP;
      default:
-       NOTREACHED() << "Unexpected WebNavigationPolicy";
---- ui/base/mojom/window_open_disposition_mojom_traits.h.orig
-+++ ui/base/mojom/window_open_disposition_mojom_traits.h
+--- a/ui/base/mojom/window_open_disposition_mojom_traits.h
++++ b/ui/base/mojom/window_open_disposition_mojom_traits.h
 @@ -5,6 +5,7 @@
  #ifndef UI_BASE_MOJOM_WINDOW_OPEN_DISPOSITION_MOJOM_TRAITS_H_
  #define UI_BASE_MOJOM_WINDOW_OPEN_DISPOSITION_MOJOM_TRAITS_H_
@@ -32,16 +33,16 @@
  #include "base/notreached.h"
  #include "mojo/public/cpp/bindings/enum_traits.h"
  #include "ui/base/mojom/window_open_disposition.mojom.h"
-@@ -28,6 +29,8 @@ struct EnumTraits<ui::mojom::WindowOpenD
-       case WindowOpenDisposition::NEW_BACKGROUND_TAB:
-         return ui::mojom::WindowOpenDisposition::NEW_BACKGROUND_TAB;
+@@ -30,6 +31,8 @@ struct EnumTraits<ui::mojom::WindowOpenD
+       case WindowOpenDisposition::NEW_PICTURE_IN_PICTURE:
+         return ui::mojom::WindowOpenDisposition::NEW_PICTURE_IN_PICTURE;
        case WindowOpenDisposition::NEW_POPUP:
 +        if (base::CommandLine::ForCurrentProcess()->HasSwitch("popups-to-tabs"))
 +          return ui::mojom::WindowOpenDisposition::NEW_FOREGROUND_TAB;
          return ui::mojom::WindowOpenDisposition::NEW_POPUP;
        case WindowOpenDisposition::NEW_WINDOW:
          return ui::mojom::WindowOpenDisposition::NEW_WINDOW;
-@@ -63,6 +66,8 @@ struct EnumTraits<ui::mojom::WindowOpenD
+@@ -68,6 +71,8 @@ struct EnumTraits<ui::mojom::WindowOpenD
          return true;
        case ui::mojom::WindowOpenDisposition::NEW_POPUP:
          *out = WindowOpenDisposition::NEW_POPUP;