diff options
Diffstat (limited to 'src/core/content_utility_client_qt.cpp')
| -rw-r--r-- | src/core/content_utility_client_qt.cpp | 65 |
1 files changed, 21 insertions, 44 deletions
diff --git a/src/core/content_utility_client_qt.cpp b/src/core/content_utility_client_qt.cpp index 3582e15a7..7af90c7a1 100644 --- a/src/core/content_utility_client_qt.cpp +++ b/src/core/content_utility_client_qt.cpp @@ -1,48 +1,16 @@ -/**************************************************************************** -** -** Copyright (C) 2018 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) 2018 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 "content_utility_client_qt.h" -#include "base/no_destructor.h" #include "mojo/public/cpp/bindings/service_factory.h" #include "services/proxy_resolver/proxy_resolver_factory_impl.h" +#if BUILDFLAG(IS_WIN) +#include "services/proxy_resolver_win/public/mojom/proxy_resolver_win.mojom.h" +#include "services/proxy_resolver_win/windows_system_proxy_resolver_impl.h" +#endif + namespace QtWebEngineCore { ContentUtilityClientQt::ContentUtilityClientQt() @@ -56,12 +24,21 @@ auto RunProxyResolver(mojo::PendingReceiver<proxy_resolver::mojom::ProxyResolver return std::make_unique<proxy_resolver::ProxyResolverFactoryImpl>(std::move(receiver)); } -mojo::ServiceFactory *ContentUtilityClientQt::GetIOThreadServiceFactory() +#if BUILDFLAG(IS_WIN) +auto RunWindowsSystemProxyResolver( + mojo::PendingReceiver<proxy_resolver_win::mojom::WindowsSystemProxyResolver> receiver) +{ + return std::make_unique<proxy_resolver_win::WindowsSystemProxyResolverImpl>( + std::move(receiver)); +} +#endif + +void ContentUtilityClientQt::RegisterIOThreadServices(mojo::ServiceFactory &services) { - static base::NoDestructor<mojo::ServiceFactory> factory { - RunProxyResolver, - }; - return factory.get(); + services.Add(RunProxyResolver); +#if BUILDFLAG(IS_WIN) + services.Add(RunWindowsSystemProxyResolver); +#endif } } // namespace |