diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-04-07 14:00:35 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-15 17:03:28 +0200 |
| commit | 84ced937a0f9f2874e32e16c4c6ebf72b46904c9 (patch) | |
| tree | d78373210638476d0e0ee67e398dca7a1630544b /src/core/javascript_dialog_controller.cpp | |
| parent | fc55f57e6cbbcd0027493d0bbea8161a814aaff2 (diff) | |
Replace uses of QWebEngineFrame with a security origin URL
This changes implemented methods. The rest of the references will go
away with the public headers cleanup.
Change-Id: I82340cd7a4488c4b463489ae98cd9c16de4e7487
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'src/core/javascript_dialog_controller.cpp')
| -rw-r--r-- | src/core/javascript_dialog_controller.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/javascript_dialog_controller.cpp b/src/core/javascript_dialog_controller.cpp index ed0431084..973fa89b7 100644 --- a/src/core/javascript_dialog_controller.cpp +++ b/src/core/javascript_dialog_controller.cpp @@ -54,10 +54,12 @@ void JavaScriptDialogControllerPrivate::dialogFinished(bool accepted, const base } JavaScriptDialogControllerPrivate::JavaScriptDialogControllerPrivate(WebContentsAdapterClient::JavascriptDialogType t, const QString &msg, const QString &prompt - , const content::JavaScriptDialogManager::DialogClosedCallback &cb, content::WebContents *c) + , const QUrl &securityOrigin, const content::JavaScriptDialogManager::DialogClosedCallback &cb + , content::WebContents *c) : type(t) , message(msg) , defaultPrompt(prompt) + , securityOrigin(securityOrigin) , callback(cb) , contents(c) { @@ -82,6 +84,11 @@ WebContentsAdapterClient::JavascriptDialogType JavaScriptDialogController::type( return d->type; } +QUrl JavaScriptDialogController::securityOrigin() const +{ + return d->securityOrigin; +} + void JavaScriptDialogController::textProvided(const QString &text) { d->userInput = text; |