From 5be48d4238465b4efd36ed4bbb96ec407be9f217 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 12 Oct 2018 11:58:16 +0200 Subject: Add proxy resolver service This adds proxy resolver service as a part of content utility process and pulls in the corresponding change in Chromium. Fixes: QTBUG-69281 Change-Id: Icb2b67e1e506a5b511531322a8c13d7df0e11f9f Reviewed-by: Allan Sandfeld Jensen --- src/core/content_utility_client_qt.h | 56 ++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/core/content_utility_client_qt.h (limited to 'src/core/content_utility_client_qt.h') diff --git a/src/core/content_utility_client_qt.h b/src/core/content_utility_client_qt.h new file mode 100644 index 000000000..df1eb5557 --- /dev/null +++ b/src/core/content_utility_client_qt.h @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** 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$ +** +****************************************************************************/ + +#ifndef CONTENT_UTILITY_CLIENT_QT_H +#define CONTENT_UTILITY_CLIENT_QT_H +#include "content/public/utility/content_utility_client.h" + +class MashServiceFactory; +class UtilityMessageHandler; + +class ContentUtilityClientQt : public content::ContentUtilityClient { + public: + ContentUtilityClientQt(); + ~ContentUtilityClientQt() override; + + // content::ContentUtilityClient: + void RegisterServices(StaticServiceMap* services) override; +}; + +#endif -- cgit v1.2.3