diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-12 17:44:19 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-13 09:57:51 +0000 |
| commit | b8af7d665ba92fbae3ab62b540dc1caed7ec7b00 (patch) | |
| tree | 56db9539ab71e543cd525c0475416013a0189db9 /src/core/javascript_dialog_manager_qt.cpp | |
| parent | 3d698f5de377bde2293e222536bc50171cfdf1b8 (diff) | |
Reduce javascript dialog URL to origin
In recent versions of Chromium the origin_url given to
RunJavaScriptDialog have become a full url instead of a URL on origin
form. To maintain the previous behavior we need to extract the origin
subset of the URL.
Change-Id: I4cc82ddd81c0330fd3741297395f72e89a267d51
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/core/javascript_dialog_manager_qt.cpp')
| -rw-r--r-- | src/core/javascript_dialog_manager_qt.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/javascript_dialog_manager_qt.cpp b/src/core/javascript_dialog_manager_qt.cpp index 67f33327e..670eb671f 100644 --- a/src/core/javascript_dialog_manager_qt.cpp +++ b/src/core/javascript_dialog_manager_qt.cpp @@ -64,7 +64,7 @@ void JavaScriptDialogManagerQt::RunJavaScriptDialog(content::WebContents *webCon } WebContentsAdapterClient::JavascriptDialogType dialogType = static_cast<WebContentsAdapterClient::JavascriptDialogType>(javascriptMessageType); - runDialogForContents(webContents, dialogType, toQt(messageText).toHtmlEscaped(), toQt(defaultPromptText).toHtmlEscaped(), toQt(originUrl), callback); + runDialogForContents(webContents, dialogType, toQt(messageText).toHtmlEscaped(), toQt(defaultPromptText).toHtmlEscaped(), toQt(originUrl.GetOrigin()), callback); } void JavaScriptDialogManagerQt::RunBeforeUnloadDialog(content::WebContents *webContents, const base::string16 &messageText, |