8000 fix: ensure version of `xdg-dialog-portal` with `defaultPath` support by codebytere · Pull Request #43570 · electron/electron · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix: ensure version of xdg-dialog-portal with defaultPath support #43570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2024
Merged

fix: ensure version of xdg-dialog-portal with defaultPath support #43570

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Hide whitespace
Diff view
19 changes: 15 additions & 4 deletions patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,21 @@
&SelectFileDialogLinuxKde::OnSelectSingleFolderDialogResponse, this,
parent));
diff --git a/ui/shell_dialogs/select_file_dialog_linux_portal.cc b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
index 61ddcbf7bf57e423099c7d392a19b3ec79b5d03f..8c3f4058ad7e9f6460c8d0516a150db612e8f574 100644
index 61ddcbf7bf57e423099c7d392a19b3ec79b5d03f..b2d2e11f72dcca5b3791a6dd3e9e5ae930a1f701 100644
--- a/ui/s 10000 hell_dialogs/select_file_dialog_linux_portal.cc
+++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
@@ -221,6 +221,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
@@ -44,7 +44,9 @@ constexpr char kMethodStartServiceByName[] = "StartServiceByName";

Check failure on line 205 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L202-L205 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +index d94540d0a7bf90f57acdaf8ca6665cf283a646bf..9a892a2d1ac1480d3af7968c9dcaa7c69806fd0e 100644
 +--- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 ++++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 +@@ -216,6 +216,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++=======
+ index 61ddcbf7bf57e423099c7d392a19b3ec79b5d03f..b2d2e11f72dcca5b3791a6dd3e9e5ae930a1f701 100644
+ --- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ +++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ @@ -44,7 +44,9 @@ constexpr char kMethodStartServiceByName[] = "StartServiceByName";
+  constexpr char kXdgPortalService[] = "org.freedesktop.portal.Desktop";
+  constexpr char kXdgPortalObject[] = "/org/freedesktop/portal/desktop";
+  
+ -constexpr int kXdgPortalRequiredVersion = 3;
+ +// Version 4 includes support for current_folder option to the OpenFile method via
+ +// https://github.com/flatpak/xdg-desktop-portal/commit/71165a5.
+ +constexpr int kXdgPortalRequiredVersion = 4;
+  
+  constexpr char kXdgPortalRequestInterfaceName[] =
+      "org.freedesktop.portal.Request";
+ @@ -221,6 +223,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 205 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L202-L205 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +index d94540d0a7bf90f57acdaf8ca6665cf283a646bf..9a892a2d1ac1480d3af7968c9dcaa7c69806fd0e 100644
 +--- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 ++++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 +@@ -216,6 +216,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++=======
+ index 61ddcbf7bf57e423099c7d392a19b3ec79b5d03f..b2d2e11f72dcca5b3791a6dd3e9e5ae930a1f701 100644
+ --- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ +++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ @@ -44,7 +44,9 @@ constexpr char kMethodStartServiceByName[] = "StartServiceByName";
+  constexpr char kXdgPortalService[] = "org.freedesktop.portal.Desktop";
+  constexpr char kXdgPortalObject[] = "/org/freedesktop/portal/desktop";
+  
+ -constexpr int kXdgPortalRequiredVersion = 3;
+ +// Version 4 includes support for current_folder option to the OpenFile method via
+ +// https://github.com/flatpak/xdg-desktop-portal/commit/71165a5.
+ +constexpr int kXdgPortalRequiredVersion = 4;
+  
+  constexpr char kXdgPortalRequestInterfaceName[] =
+      "org.freedesktop.portal.Request";
+ @@ -221,6 +223,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 205 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L202-L205 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +index d94540d0a7bf90f57acdaf8ca6665cf283a646bf..9a892a2d1ac1480d3af7968c9dcaa7c69806fd0e 100644
 +--- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 ++++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 +@@ -216,6 +216,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++=======
+ index 61ddcbf7bf57e423099c7d392a19b3ec79b5d03f..b2d2e11f72dcca5b3791a6dd3e9e5ae930a1f701 100644
+ --- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ +++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ @@ -44,7 +44,9 @@ constexpr char kMethodStartServiceByName[] = "StartServiceByName";
+  constexpr char kXdgPortalService[] = "org.freedesktop.portal.Desktop";
+  constexpr char kXdgPortalObject[] = "/org/freedesktop/portal/desktop";
+  
+ -constexpr int kXdgPortalRequiredVersion = 3;
+ +// Version 4 includes support for current_folder option to the OpenFile method via
+ +// https://github.com/flatpak/xdg-desktop-portal/commit/71165a5.
+ +constexpr int kXdgPortalRequiredVersion = 4;
+  
+  constexpr char kXdgPortalRequestInterfaceName[] =
+      "org.freedesktop.portal.Request";
+ @@ -221,6 +223,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 205 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L202-L205 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +index d94540d0a7bf90f57acdaf8ca6665cf283a646bf..9a892a2d1ac1480d3af7968c9dcaa7c69806fd0e 100644
 +--- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 ++++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 +@@ -216,6 +216,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++=======
+ index 61ddcbf7bf57e423099c7d392a19b3ec79b5d03f..b2d2e11f72dcca5b3791a6dd3e9e5ae930a1f701 100644
+ --- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ +++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ @@ -44,7 +44,9 @@ constexpr char kMethodStartServiceByName[] = "StartServiceByName";
+  constexpr char kXdgPortalService[] = "org.freedesktop.portal.Desktop";
+  constexpr char kXdgPortalObject[] = "/org/freedesktop/portal/desktop";
+  
+ -constexpr int kXdgPortalRequiredVersion = 3;
+ +// Version 4 includes support for current_folder option to the OpenFile method via
+ +// https://github.com/flatpak/xdg-desktop-portal/commit/71165a5.
+ +constexpr int kXdgPortalRequiredVersion = 4;
+  
+  constexpr char kXdgPortalRequestInterfaceName[] =
+      "org.freedesktop.portal.Request";
+ @@ -221,6 +223,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 205 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L202-L205 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +index d94540d0a7bf90f57acdaf8ca6665cf283a646bf..9a892a2d1ac1480d3af7968c9dcaa7c69806fd0e 100644
 +--- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 ++++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 +@@ -216,6 +216,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++=======
+ index 61ddcbf7bf57e423099c7d392a19b3ec79b5d03f..b2d2e11f72dcca5b3791a6dd3e9e5ae930a1f701 100644
+ --- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ +++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ @@ -44,7 +44,9 @@ constexpr char kMethodStartServiceByName[] = "StartServiceByName";
+  constexpr char kXdgPortalService[] = "org.freedesktop.portal.Desktop";
+  constexpr char kXdgPortalObject[] = "/org/freedesktop/portal/desktop";
+  
+ -constexpr int kXdgPortalRequiredVersion = 3;
+ +// Version 4 includes support for current_folder option to the OpenFile method via
+ +// https://github.com/flatpak/xdg-desktop-portal/commit/71165a5.
+ +constexpr int kXdgPortalRequiredVersion = 4;
+  
+  constexpr char kXdgPortalRequestInterfaceName[] =
+      "org.freedesktop.portal.Request";
+ @@ -221,6 +223,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 205 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L202-L205 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +index d94540d0a7bf90f57acdaf8ca6665cf283a646bf..9a892a2d1ac1480d3af7968c9dcaa7c69806fd0e 100644
 +--- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 ++++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
 +@@ -216,6 +216,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++=======
+ index 61ddcbf7bf57e423099c7d392a19b3ec79b5d03f..b2d2e11f72dcca5b3791a6dd3e9e5ae930a1f701 100644
+ --- a/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ +++ b/ui/shell_dialogs/select_file_dialog_linux_portal.cc
+ @@ -44,7 +44,9 @@ constexpr char kMethodStartServiceByName[] = "StartServiceByName";
+  constexpr char kXdgPortalService[] = "org.freedesktop.portal.Desktop";
+  constexpr char kXdgPortalObject[] = "/org/freedesktop/portal/desktop";
+  
+ -constexpr int kXdgPortalRequiredVersion = 3;
+ +// Version 4 includes support for current_folder option to the OpenFile method via
+ +// https://github.com/flatpak/xdg-desktop-portal/commit/71165a5.
+ +constexpr int kXdgPortalRequiredVersion = 4;
+  
+  constexpr char kXdgPortalRequestInterfaceName[] =
+      "org.freedesktop.portal.Request";
+ @@ -221,6 +223,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
++>>>>>>> fix: ensure version of `xdg-dialog-portal` with `defaultPath` support (#43570)
constexpr char kXdgPortalService[] = "org.freedesktop.portal.Desktop";
constexpr char kXdgPortalObject[] = "/org/freedesktop/portal/desktop";

-constexpr int kXdgPortalRequiredVersion = 3;
+// Version 4 includes support for current_folder option to the OpenFile method via
+// https://github.com/flatpak/xdg-desktop-portal/commit/71165a5.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would be good to include the version bump commit flatpak/xdg-desktop-portal@4bf4d63 for clarity.

Copy link
Member Author
@codebytere codebytere Sep 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@deepak1556 I don't think they would hard block on it the way we do as they don't seem to use defaultPath in open dialogs. I can try though! I did manage to upstream this change: https://chromium-review.googlesource.com/c/chromium/src/+/5786982

+constexpr int kXdgPortalRequiredVersion = 4;

constexpr char kXdgPortalRequestInterfaceName[] =
"org.freedesktop.portal.Request";
@@ -221,6 +223,8 @@ void SelectFileDialogLinuxPortal::SelectFileImpl(
weak_factory_.GetWeakPtr()));
info_->type = type;
info_->main_task_runner = base::SequencedTaskRunner::GetCurrentDefault();
Expand All @@ -211,18 +222,18 @@

if (owning_window) {
if (auto* root = owning_window->GetRootWindow()) {
@@ -557,7 +559,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
@@ -557,7 +561,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
response_handle_token);

if (type == SelectFileDialog::Type::SELECT_UPLOAD_FOLDER) {
- AppendStringOption(&options_writer, kFileChooserOptionAcceptLabel,
+ const std::string accept_label =
+ button_label.empty() ? kFileChooserOptionAcceptLabel : button_label;
+ AppendStringOption(&options_writer, accept_label,

Check failure on line 232 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L232 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -552,7 +554,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -557,7 +561,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 232 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L232 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -552,7 +554,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -557,7 +561,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 232 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L232 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -552,7 +554,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -557,7 +561,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 232 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L232 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -552,7 +554,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -557,7 +561,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 232 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L232 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -552,7 +554,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -557,7 +561,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 232 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L232 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -552,7 +554,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -557,7 +561,9 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of `xdg-dialog-portal` with `defaultPath` support (#43570)
l10n_util::GetStringUTF8(
IDS_SELECT_UPLOAD_FOLDER_DIALOG_UPLOAD_BUTTON));
}
@@ -566,6 +570,8 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
@@ -566,6 +572,8 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
type == SelectFileDialog::Type::SELECT_UPLOAD_FOLDER ||
type == SelectFileDialog::Type::SELECT_EXISTING_FOLDER) {
AppendBoolOption(&options_writer, kFileChooserOptionDirectory, true);
Expand All @@ -233,7 +244,7 @@
}
diff --git a/ui/shell_dialogs/select_file_dialog_linux_portal.h b/ui/shell_dialogs/select_file_dialog_linux_portal.h
index 47e3b0e658858ba5f3219f04d258bdf6dd7c26ed..ff8eaabb406cdf759f7a62725171aaf9f74ce183 100644
--- a/ui/shell_dialogs/select_file_dialog_linux_portal.h

Check failure on line 247 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L247 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -561,12 +565,13 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -566,6 +572,8 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 247 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L247 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -561,12 +565,13 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -566,6 +572,8 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 247 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L247 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -561,12 +565,13 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -566,6 +572,8 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 247 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L247 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -561,12 +565,13 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -566,6 +572,8 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 247 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L247 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -561,12 +565,13 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -566,6 +572,8 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of xdg-dialog-portal with defaultPath support

Check failure on line 247 in patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch

View check run for this annotation

trop / Backportable? - 32-x-y

patches/chromium/feat_add_support_for_missing_dialog_features_to_shell_dialogs.patch#L247 

Patch Conflict
Raw output 
++<<<<<<< HEAD
 +@@ -561,12 +565,13 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++=======
+ @@ -566,6 +572,8 @@ void SelectFileDialogLinuxPortal::DialogInfo::AppendOptions(
++>>>>>>> fix: ensure version of `xdg-dialog-portal` with `defaultPath` support (#43570)
+++ b/ui/shell_dialogs/select_file_dialog_linux_portal.h
@@ -117,6 +117,8 @@ class SelectFileDialogLinuxPortal : public SelectFileDialogLinux {
Type type;
Expand Down
0