diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-19 11:42:25 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-22 17:06:43 +0200 |
commit | 34cd9bb6006b854ef8029448be10822b14a2b7ac (patch) | |
tree | 2d04302f7d5c71b13ef73fc419937047b3a0f218 /src/core/content_utility_client_qt.cpp | |
parent | 404201b9a41564512937a7d96e55d6b095bdcab0 (diff) | |
parent | 6fffee8bfb270eda4f06fa5dbe3a4b190036e90a (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
configure.json
src/3rdparty
src/core/content_browser_client_qt.cpp
src/core/content_browser_client_qt.h
src/core/login_delegate_qt.cpp
src/core/login_delegate_qt.h
src/core/net/url_request_context_getter_qt.cpp
src/core/net/url_request_context_getter_qt.h
src/core/qtwebengine.gni
3rdparty changes:
616a7f558c7e This is expected for us, so don't report it as an error.
c30febceaa1b Do not write <protocol>.json to source directory
9e68e4f2d92c Remove incomplete logic to detect AMD K2 CPU's
e0ed41c8e90a FIXUP: This is expected for us, so don't report it as an error.
f9fd9109b4b7 Fix --single-process --disable-gpu combination not to hit asserts
f305d65cc27e Reduce severity level of messages when kDisableGpu switch is used
5e3e5074bb78 Work around MSVC2017 optimizer bug when printing a page usind Pdfium
34f52ec3bae8 Bump maximum number of custom isolated world ids
f7a2f8153c82 Fix hunspell::NodeReader::affix_id_for_leaf bounds check
1e80090f7044 Fix resolve_proxy service permissions
2e498629651d Add proxy_resolver_manifest
Change-Id: I2b176c80aa315a0ae0a22b5707694fdcd407407b
Diffstat (limited to 'src/core/content_utility_client_qt.cpp')
-rw-r--r-- | src/core/content_utility_client_qt.cpp | 60 |
1 files changed, 60 insertions, 0 deletions
diff --git a/src/core/content_utility_client_qt.cpp b/src/core/content_utility_client_qt.cpp new file mode 100644 index 000000000..9e86826fe --- /dev/null +++ b/src/core/content_utility_client_qt.cpp @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#include "content_utility_client_qt.h" + +#include "content/public/utility/utility_thread.h" +#include "services/proxy_resolver/proxy_resolver_service.h" + +ContentUtilityClientQt::ContentUtilityClientQt() { +} + +ContentUtilityClientQt::~ContentUtilityClientQt() = default; + + +void ContentUtilityClientQt::RegisterServices( + ContentUtilityClient::StaticServiceMap* services) { + service_manager::EmbeddedServiceInfo proxy_resolver_info; + proxy_resolver_info.task_runner = + content::ChildThread::Get()->GetIOTaskRunner(); + proxy_resolver_info.factory = + base::Bind(&proxy_resolver::ProxyResolverService::CreateService); + services->emplace(proxy_resolver::mojom::kProxyResolverServiceName, + proxy_resolver_info); +} |