diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-10-17 16:01:40 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-10-20 10:21:04 +0200 |
commit | acce17434876082ba46c631109b48e641185ca17 (patch) | |
tree | 08520f64ec4a8ce2841a0ceb4d6e6c3851eb5b46 /src/webenginewidgets/api/qwebenginepage.h | |
parent | 181d8fdf4cb45f31dd1692c5c6ea677eaa697929 (diff) |
Implement acceptNavigationRequest for the widgets API.
This is the equivalent API for navigationRequested in QtQuick.
This patch also enables and updates tests that depended on this
API, and removes the ones that we will not support.
Change-Id: I28970c11225420a9680fbd767880130492664179
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'src/webenginewidgets/api/qwebenginepage.h')
-rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index cda6e620f..ecd8a5712 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -135,6 +135,16 @@ public: PermissionDeniedByUser }; + // must match WebContentsAdapterClient::NavigationType + enum NavigationType { + NavigationTypeLinkClicked, + NavigationTypeTyped, + NavigationTypeFormSubmitted, + NavigationTypeBackForward, + NavigationTypeReload, + NavigationTypeOther + }; + enum Feature { Notifications, Geolocation, @@ -244,6 +254,7 @@ protected: virtual bool javaScriptPrompt(const QUrl &securityOrigin, const QString& msg, const QString& defaultValue, QString* result); virtual void javaScriptConsoleMessage(JavaScriptConsoleMessageLevel level, const QString& message, int lineNumber, const QString& sourceID); virtual bool certificateError(const QWebEngineCertificateError &certificateError); + virtual bool acceptNavigationRequest(const QUrl &url, NavigationType type, bool isMainFrame); private: Q_DECLARE_PRIVATE(QWebEnginePage); |