diff options
Diffstat (limited to 'src/core/login_delegate_qt.cpp')
| -rw-r--r-- | src/core/login_delegate_qt.cpp | 60 |
1 files changed, 5 insertions, 55 deletions
diff --git a/src/core/login_delegate_qt.cpp b/src/core/login_delegate_qt.cpp index 7942c8279..3f916b797 100644 --- a/src/core/login_delegate_qt.cpp +++ b/src/core/login_delegate_qt.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2016 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 // Copyright 2013 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be @@ -43,28 +7,15 @@ #include "login_delegate_qt.h" -#include "base/task/post_task.h" #include "content/browser/web_contents/web_contents_impl.h" #include "content/public/browser/browser_task_traits.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" -#include "extensions/buildflags/buildflags.h" -#include "services/network/public/cpp/features.h" - -#if BUILDFLAG(ENABLE_EXTENSIONS) -#include "extensions/browser/info_map.h" -#include "extensions/common/extension.h" -#include "extensions/common/manifest_handlers/mime_types_handler.h" -#endif // BUILDFLAG(ENABLE_EXTENSIONS) - #include "net/url_request/url_request.h" +#include "services/network/public/cpp/features.h" #include "authentication_dialog_controller.h" #include "authentication_dialog_controller_p.h" -#if BUILDFLAG(ENABLE_EXTENSIONS) -#include "extensions/extension_system_qt.h" -#endif // BUILDFLAG(ENABLE_EXTENSIONS) -#include "resource_context_qt.h" #include "type_conversion.h" #include "web_contents_view_qt.h" #include "web_engine_context.h" @@ -82,8 +33,7 @@ LoginDelegateQt::LoginDelegateQt(const net::AuthChallengeInfo &authInfo, , m_auth_required_callback(std::move(auth_required_callback)) , m_weakFactory(this) { - base::PostTask( - FROM_HERE, { content::BrowserThread::UI }, + content::GetUIThreadTaskRunner({})->PostTask(FROM_HERE, base::BindOnce(&LoginDelegateQt::triggerDialog, m_weakFactory.GetWeakPtr())); } @@ -145,7 +95,7 @@ void LoginDelegateQt::sendAuthToRequester(bool success, const QString &user, con if (success && web_contents()) std::move(m_auth_required_callback).Run(net::AuthCredentials(toString16(user), toString16(password))); else - std::move(m_auth_required_callback).Run(base::nullopt); + std::move(m_auth_required_callback).Run(absl::nullopt); } } |