summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-04-14 12:47:08 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-04-15 12:27:23 +0200
commit3125f1ac3951c63c20110c7e3946ca281cebbdf3 (patch)
treea7cad2baac3cf27f0f7917c1896c199ff91edda8
parent0ac8e8197f2c746db46ff10461c691678353ac23 (diff)
Remove ExtensionsBrowserAPIProviderQt
We don't add any extension API beyond the core ones and are just duplicating what CoreExtensionsBrowserAPIProvider does. Change-Id: Ia50f89e7e23dc0e155f8f2e01b4f7f1e262cbe53 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
-rw-r--r--src/core/core_chromium.pri2
-rw-r--r--src/core/extensions/extensions_browser_api_provider_qt.cpp54
-rw-r--r--src/core/extensions/extensions_browser_api_provider_qt.h62
-rw-r--r--src/core/extensions/extensions_browser_client_qt.cpp12
4 files changed, 0 insertions, 130 deletions
diff --git a/src/core/core_chromium.pri b/src/core/core_chromium.pri
index 6a8b8c4bd..e1f5cd7ac 100644
--- a/src/core/core_chromium.pri
+++ b/src/core/core_chromium.pri
@@ -334,7 +334,6 @@ qtConfig(webengine-extensions) {
extensions/extension_system_factory_qt.cpp \
extensions/extension_web_contents_observer_qt.cpp \
extensions/extensions_api_client_qt.cpp \
- extensions/extensions_browser_api_provider_qt.cpp \
extensions/extensions_browser_client_qt.cpp \
extensions/mime_handler_view_guest_delegate_qt.cpp \
net/plugin_response_interceptor_url_loader_throttle.cpp \
@@ -351,7 +350,6 @@ qtConfig(webengine-extensions) {
extensions/extension_system_factory_qt.h \
extensions/extension_web_contents_observer_qt.h \
extensions/extensions_api_client_qt.h \
- extensions/extensions_browser_api_provider_qt.h \
extensions/extensions_browser_client_qt.h \
extensions/mime_handler_view_guest_delegate_qt.h \
net/plugin_response_interceptor_url_loader_throttle.h \
diff --git a/src/core/extensions/extensions_browser_api_provider_qt.cpp b/src/core/extensions/extensions_browser_api_provider_qt.cpp
deleted file mode 100644
index 731dfb0fd..000000000
--- a/src/core/extensions/extensions_browser_api_provider_qt.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 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 "extensions_browser_api_provider_qt.h"
-
-#include "extensions/browser/api/generated_api_registration.h"
-
-namespace extensions {
-ExtensionsBrowserAPIProviderQt::ExtensionsBrowserAPIProviderQt() = default;
-ExtensionsBrowserAPIProviderQt::~ExtensionsBrowserAPIProviderQt() = default;
-
-void ExtensionsBrowserAPIProviderQt::RegisterExtensionFunctions(ExtensionFunctionRegistry *registry)
-{
- api::GeneratedFunctionRegistry::RegisterAll(registry);
-}
-
-
-}
diff --git a/src/core/extensions/extensions_browser_api_provider_qt.h b/src/core/extensions/extensions_browser_api_provider_qt.h
deleted file mode 100644
index f1d10ac95..000000000
--- a/src/core/extensions/extensions_browser_api_provider_qt.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 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 EXTENSIONS_API_PROVIDER_QT_H
-#define EXTENSIONS_API_PROVIDER_QT_H
-
-#include "extensions/browser/extensions_browser_api_provider.h"
-#include "base/macros.h"
-
-namespace extensions {
-
-class ExtensionsBrowserAPIProviderQt : public ExtensionsBrowserAPIProvider
-{
-public:
- ExtensionsBrowserAPIProviderQt();
- ~ExtensionsBrowserAPIProviderQt() override;
-
- void RegisterExtensionFunctions(ExtensionFunctionRegistry *registry) override;
-
-private:
- DISALLOW_COPY_AND_ASSIGN(ExtensionsBrowserAPIProviderQt);
-};
-
-}
-
-#endif // EXTENSIONS_API_PROVIDER_QT_H
diff --git a/src/core/extensions/extensions_browser_client_qt.cpp b/src/core/extensions/extensions_browser_client_qt.cpp
index 8b5da3d60..1b2bb51f4 100644
--- a/src/core/extensions/extensions_browser_client_qt.cpp
+++ b/src/core/extensions/extensions_browser_client_qt.cpp
@@ -79,7 +79,6 @@
#include "extension_system_factory_qt.h"
#include "extension_web_contents_observer_qt.h"
#include "extensions_api_client_qt.h"
-#include "extensions_browser_api_provider_qt.h"
#include "extensions_browser_client_qt.h"
#include "web_engine_library_info.h"
@@ -274,7 +273,6 @@ ExtensionsBrowserClientQt::ExtensionsBrowserClientQt()
, resource_manager_(new ComponentExtensionResourceManagerQt)
{
AddAPIProvider(std::make_unique<CoreExtensionsBrowserAPIProvider>());
- AddAPIProvider(std::make_unique<ExtensionsBrowserAPIProviderQt>());
}
ExtensionsBrowserClientQt::~ExtensionsBrowserClientQt()
@@ -451,12 +449,6 @@ ExtensionSystemProvider *ExtensionsBrowserClientQt::GetExtensionSystemFactory()
return ExtensionSystemFactoryQt::GetInstance();
}
-// void ExtensionsBrowserClientQt::RegisterExtensionFunctions(ExtensionFunctionRegistry *registry) const
-//{
-// // Register core extension-system APIs.
-// api::GeneratedFunctionRegistry::RegisterAll(registry);
-//}
-
void ExtensionsBrowserClientQt::RegisterExtensionInterfaces(service_manager::BinderRegistryWithArgs<content::RenderFrameHost *> *registry,
content::RenderFrameHost *render_frame_host,
const Extension *extension) const
@@ -470,10 +462,6 @@ void ExtensionsBrowserClientQt::RegisterBrowserInterfaceBindersForFrame(
const Extension* extension) const
{
PopulateExtensionFrameBinders(binder_map, render_frame_host, extension);
-
- // FIXME Do we need something from here?
- // PopulateChromeFrameBindersForExtension(binder_map, render_frame_host,
- // extension);
}
std::unique_ptr<RuntimeAPIDelegate> ExtensionsBrowserClientQt::CreateRuntimeAPIDelegate(content::BrowserContext *context) const