diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2018-03-02 11:06:54 +0100 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@qt.io> | 2018-04-13 08:14:11 +0000 |
| commit | 674662d37844d6c77388053168e7f7b8432e6f59 (patch) | |
| tree | f7aaa0722402030be0602694edf4c13712ebec18 /src/core/web_contents_delegate_qt.cpp | |
| parent | b78e0c8a1e2df919f652da5e508306c8250c012e (diff) | |
Use wrappers in QtWebEngineCore public interface
Stop exporting quota / RegisterProtocolHandler request controller classes, and
use the public wrapper classes in WebContentsAdapterClient instead.
Change-Id: Iaa380b6ceb4f9464fc05dd012ee5df219f11f189
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/core/web_contents_delegate_qt.cpp')
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index ab398ec44..40fc0934d 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -51,6 +51,8 @@ #include "file_picker_controller.h" #include "media_capture_devices_dispatcher.h" #include "net/network_delegate_qt.h" +#include "qwebengineregisterprotocolhandlerrequest.h" +#include "register_protocol_handler_request_controller_impl.h" #include "render_widget_host_view_qt.h" #include "type_conversion.h" #include "visited_links_manager_qt.h" @@ -58,7 +60,6 @@ #include "web_contents_adapter_p.h" #include "web_engine_context.h" #include "web_engine_settings.h" -#include "register_protocol_handler_request_controller_impl.h" #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" #include "components/web_cache/browser/web_cache_manager.h" @@ -638,9 +639,9 @@ void WebContentsDelegateQt::RegisterProtocolHandler(content::WebContents *webCon if (registry->SilentlyHandleRegisterHandlerRequest(handler)) return; - QSharedPointer<RegisterProtocolHandlerRequestController> controller( - new RegisterProtocolHandlerRequestControllerImpl(webContents, handler)); - m_viewClient->runRegisterProtocolHandlerRequest(std::move(controller)); + QWebEngineRegisterProtocolHandlerRequest request( + QSharedPointer<RegisterProtocolHandlerRequestControllerImpl>::create(webContents, handler)); + m_viewClient->runRegisterProtocolHandlerRequest(std::move(request)); } void WebContentsDelegateQt::UnregisterProtocolHandler(content::WebContents *webContents, const std::string &protocol, const GURL &url, bool) |