diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 20:48:14 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 20:48:14 +0000 |
| commit | 688e2ee327914e5e64eca2b1fabbefad3d70a734 (patch) | |
| tree | 681928f02a526ddfd10a18b3190193bf0c18048b /content/browser/web_contents | |
| parent | 259c42fe55a70f85790ac677018b565d10247127 (diff) | |
| download | chromium_src-688e2ee327914e5e64eca2b1fabbefad3d70a734.zip chromium_src-688e2ee327914e5e64eca2b1fabbefad3d70a734.tar.gz chromium_src-688e2ee327914e5e64eca2b1fabbefad3d70a734.tar.bz2 | |
Revert "Plumb user_gesture up from Blink to the JavaScript dialog code..."
This reverts commit r220258.
This broke the case where a web page popped a JavaScript alert and then a popup.
BUG=263192
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/23484038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/web_contents')
4 files changed, 2 insertions, 5 deletions
diff --git a/content/browser/web_contents/render_view_host_manager_unittest.cc b/content/browser/web_contents/render_view_host_manager_unittest.cc index 7d435fa..d8837eb 100644 --- a/content/browser/web_contents/render_view_host_manager_unittest.cc +++ b/content/browser/web_contents/render_view_host_manager_unittest.cc @@ -305,7 +305,7 @@ TEST_F(RenderViewHostManagerTest, FilterMessagesWhileSwappedOut) { ntp_process_host->sink().ClearMessages(); ViewHostMsg_RunJavaScriptMessage js_msg( rvh()->GetRoutingID(), msg, msg, kChromeURL, - JAVASCRIPT_MESSAGE_TYPE_CONFIRM, false, &result, &unused); + JAVASCRIPT_MESSAGE_TYPE_CONFIRM, &result, &unused); js_msg.EnableMessagePumping(); EXPECT_TRUE(ntp_rvh->OnMessageReceived(js_msg)); EXPECT_TRUE(ntp_process_host->sink().GetUniqueMessageMatching(IPC_REPLY_ID)); diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index bce18ad..cbb0ca3 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3431,7 +3431,6 @@ void WebContentsImpl::RunJavaScriptMessage( const string16& default_prompt, const GURL& frame_url, JavaScriptMessageType javascript_message_type, - bool user_gesture, IPC::Message* reply_msg, bool* did_suppress_message) { // Suppress JavaScript dialogs when requested. Also suppress messages when @@ -3455,7 +3454,6 @@ void WebContentsImpl::RunJavaScriptMessage( javascript_message_type, message, default_prompt, - user_gesture, base::Bind(&WebContentsImpl::OnDialogClosed, base::Unretained(this), rvh, diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index b96e9b5..459ab30 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -402,7 +402,6 @@ class CONTENT_EXPORT WebContentsImpl const string16& default_prompt, const GURL& frame_url, JavaScriptMessageType type, - bool user_gesture, IPC::Message* reply_msg, bool* did_suppress_message) OVERRIDE; virtual void RunBeforeUnloadConfirm(RenderViewHost* rvh, diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc index b20cf66..aded7ae 100644 --- a/content/browser/web_contents/web_contents_impl_unittest.cc +++ b/content/browser/web_contents/web_contents_impl_unittest.cc @@ -2014,7 +2014,7 @@ TEST_F(WebContentsImplTest, NoJSMessageOnInterstitials) { bool did_suppress_message = false; contents()->RunJavaScriptMessage(contents()->GetRenderViewHost(), ASCIIToUTF16("This is an informative message"), ASCIIToUTF16("OK"), - kGURL, JAVASCRIPT_MESSAGE_TYPE_ALERT, false, dummy_message, + kGURL, JAVASCRIPT_MESSAGE_TYPE_ALERT, dummy_message, &did_suppress_message); EXPECT_TRUE(did_suppress_message); } |