diff options
author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-01-15 17:37:16 +0100 |
---|---|---|
committer | Jüri Valdmann <juri.valdmann@qt.io> | 2018-02-13 08:17:57 +0000 |
commit | 3b935ab7bcfad503f6837c87736d01e314353f02 (patch) | |
tree | 4cdc5ba453564e82b4d1269aef97317e7da4e2e4 | |
parent | 6a6fd71af52bcbffc4fccf58e1f35b7612d16a2a (diff) |
QuotaPermissionController: Factor out PermissionController
Task-number: QTBUG-62783
Change-Id: I15fdfe6b0d4e8517b8f5752bd1af5c5a321e9cd0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r-- | src/core/core_chromium.pri | 1 | ||||
-rw-r--r-- | src/core/permission_controller.h | 84 | ||||
-rw-r--r-- | src/core/quota_permission_controller.h | 31 |
3 files changed, 88 insertions, 28 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri index c81b661a6..1b2f2edb1 100644 --- a/src/core/core_chromium.pri +++ b/src/core/core_chromium.pri @@ -155,6 +155,7 @@ HEADERS = \ media_capture_devices_dispatcher.h \ network_delegate_qt.h \ ozone_platform_qt.h \ + permission_controller.h \ permission_manager_qt.h \ process_main.h \ proxy_config_service_qt.h \ diff --git a/src/core/permission_controller.h b/src/core/permission_controller.h new file mode 100644 index 000000000..22dfeb77e --- /dev/null +++ b/src/core/permission_controller.h @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** 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 PERMISSION_CONTROLLER_H +#define PERMISSION_CONTROLLER_H + +#include "qtwebenginecoreglobal.h" + +#include <QUrl> + +namespace QtWebEngineCore { + +class QWEBENGINE_EXPORT PermissionController { +public: + PermissionController(QUrl origin) + : m_answered(false) + , m_origin(std::move(origin)) + {} + + QUrl origin() const { return m_origin; } + + void accept() { + if (!m_answered) { + m_answered = true; + accepted(); + } + } + + void reject() { + if (!m_answered) { + m_answered = true; + rejected(); + } + } + + virtual ~PermissionController() {} + +protected: + virtual void accepted() = 0; + virtual void rejected() = 0; + +private: + bool m_answered; + QUrl m_origin; +}; + +} // namespace QtWebEngineCore + +#endif // PERMISSION_CONTROLLER_H diff --git a/src/core/quota_permission_controller.h b/src/core/quota_permission_controller.h index cdd5e226a..be228f369 100644 --- a/src/core/quota_permission_controller.h +++ b/src/core/quota_permission_controller.h @@ -40,45 +40,20 @@ #ifndef QUOTA_PERMISSION_CONTROLLER_H #define QUOTA_PERMISSION_CONTROLLER_H -#include "qtwebenginecoreglobal.h" -#include <QtCore/qurl.h> +#include "permission_controller.h" namespace QtWebEngineCore { -class QWEBENGINE_EXPORT QuotaPermissionController { +class QWEBENGINE_EXPORT QuotaPermissionController : public PermissionController { public: QuotaPermissionController(QUrl origin, qint64 requestedSize) - : m_answered(false) - , m_origin(std::move(origin)) + : PermissionController(std::move(origin)) , m_requestedSize(requestedSize) {} - QUrl origin() const { return m_origin; } qint64 requestedSize() const { return m_requestedSize; } - void accept() { - if (!m_answered) { - m_answered = true; - accepted(); - } - } - - void reject() { - if (!m_answered) { - m_answered = true; - rejected(); - } - } - - virtual ~QuotaPermissionController() {} - -protected: - virtual void accepted() = 0; - virtual void rejected() = 0; - private: - bool m_answered; - QUrl m_origin; qint64 m_requestedSize; }; |