diff options
Diffstat (limited to 'src/core/select_file_dialog_factory_qt.cpp')
| -rw-r--r-- | src/core/select_file_dialog_factory_qt.cpp | 54 |
1 files changed, 9 insertions, 45 deletions
diff --git a/src/core/select_file_dialog_factory_qt.cpp b/src/core/select_file_dialog_factory_qt.cpp index baad07b24..1f897a805 100644 --- a/src/core/select_file_dialog_factory_qt.cpp +++ b/src/core/select_file_dialog_factory_qt.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtWebEngine module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "select_file_dialog_factory_qt.h" @@ -98,17 +62,16 @@ public: // ui::SelectFileDialog implementation: bool IsRunning(gfx::NativeWindow) const override; void ListenerDestroyed() override; - void SelectFileImpl(Type type, const base::string16 &title, const base::FilePath &default_path, + void SelectFileImpl(Type type, const std::u16string &title, const base::FilePath &default_path, const FileTypeInfo *file_types, int file_type_index, const base::FilePath::StringType &default_extension, - gfx::NativeWindow owning_window, void *params) override; + gfx::NativeWindow owning_window, void *params, const GURL *) override; + bool HasMultipleFileTypeChoicesImpl() override; private: WebContentsAdapterClient *m_client; QSharedPointer<FilePickerController> m_filePickerController; - - DISALLOW_COPY_AND_ASSIGN(SelectFileDialogQt); }; SelectFileDialogQt::SelectFileDialogQt(Listener *listener, @@ -139,17 +102,18 @@ extern FilePickerController *createFilePickerController(FilePickerController::Fi const QStringList &acceptedMimeTypes, QObject *parent = nullptr); -void SelectFileDialogQt::SelectFileImpl(Type type, const base::string16 &title, +void SelectFileDialogQt::SelectFileImpl(Type type, const std::u16string &title, const base::FilePath &default_path, const FileTypeInfo *file_types, int file_type_index, const base::FilePath::StringType &default_extension, - gfx::NativeWindow owning_window, void *params) + gfx::NativeWindow owning_window, void *params, const GURL *caller) { Q_UNUSED(title); Q_UNUSED(file_type_index); Q_UNUSED(default_extension); Q_UNUSED(owning_window); Q_UNUSED(params); + Q_UNUSED(caller); QStringList acceptedSuffixes; if (file_types) { @@ -173,7 +137,7 @@ SelectFileDialogFactoryQt::Create(ui::SelectFileDialog::Listener *listener, std::unique_ptr<ui::SelectFilePolicy> policy) { content::WebContents *webContents = - static_cast<SelectFilePolicyQt *>(policy.get())->webContents(); + static_cast<SelectFilePolicyQt *>(policy.get())->webContents()->GetOutermostWebContents(); WebContentsAdapterClient *client = WebContentsViewQt::from(static_cast<content::WebContentsImpl *>(webContents)->GetView()) ->client(); |