From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 12 Jun 2024 07:43:14 +0200
Subject: Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 widget/windows/nsFilePicker.h | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

(limited to 'widget/windows/nsFilePicker.h')

diff --git a/widget/windows/nsFilePicker.h b/widget/windows/nsFilePicker.h
index 59108bc0dd..5a4272d30f 100644
--- a/widget/windows/nsFilePicker.h
+++ b/widget/windows/nsFilePicker.h
@@ -56,8 +56,6 @@ class nsFilePicker final : public nsBaseWinFilePicker {
   using Maybe = mozilla::Maybe<T>;
   template <typename T>
   using Result = mozilla::Result<T, HRESULT>;
-  template <typename Res>
-  using FPPromise = RefPtr<mozilla::MozPromise<Maybe<Res>, HRESULT, true>>;
 
   using Command = mozilla::widget::filedialog::Command;
   using Results = mozilla::widget::filedialog::Results;
@@ -89,23 +87,12 @@ class nsFilePicker final : public nsBaseWinFilePicker {
   NS_IMETHOD Open(nsIFilePickerShownCallback* aCallback) override;
 
  private:
-  RefPtr<mozilla::MozPromise<bool, HRESULT, true>> ShowFolderPicker(
+  using Unit = mozilla::Ok;
+  RefPtr<mozilla::MozPromise<bool, Unit, true>> ShowFolderPicker(
       const nsString& aInitialDir);
-  RefPtr<mozilla::MozPromise<bool, HRESULT, true>> ShowFilePicker(
+  RefPtr<mozilla::MozPromise<bool, Unit, true>> ShowFilePicker(
       const nsString& aInitialDir);
 
-  // Show the dialog out-of-process.
-  static FPPromise<Results> ShowFilePickerRemote(
-      HWND aParent, FileDialogType type, nsTArray<Command> const& commands);
-  static FPPromise<nsString> ShowFolderPickerRemote(
-      HWND aParent, nsTArray<Command> const& commands);
-
-  // Show the dialog in-process.
-  static FPPromise<Results> ShowFilePickerLocal(
-      HWND aParent, FileDialogType type, nsTArray<Command> const& commands);
-  static FPPromise<nsString> ShowFolderPickerLocal(
-      HWND aParent, nsTArray<Command> const& commands);
-
   void ClearFiles();
   using ContentAnalysisResponse = mozilla::MozPromise<bool, nsresult, true>;
   RefPtr<ContentAnalysisResponse> CheckContentAnalysisService();
-- 
cgit v1.2.3