Move modal dialogs from WebViewClient to WebFrameClient, part 1/3.
BUG=304341
TEST=modal dialogs still work
Review URL: https://codereview.chromium.org/226503002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262520 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index e09fcb3..88188ce 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -328,6 +328,16 @@
virtual void WorkerCrashed(RenderFrameHost* render_frame_host) OVERRIDE;
virtual void ShowContextMenu(RenderFrameHost* render_frame_host,
const ContextMenuParams& params) OVERRIDE;
+ virtual void RunJavaScriptMessage(RenderFrameHost* rfh,
+ const base::string16& message,
+ const base::string16& default_prompt,
+ const GURL& frame_url,
+ JavaScriptMessageType type,
+ IPC::Message* reply_msg) OVERRIDE;
+ virtual void RunBeforeUnloadConfirm(RenderFrameHost* rfh,
+ const base::string16& message,
+ bool is_reload,
+ IPC::Message* reply_msg) OVERRIDE;
virtual WebContents* GetAsWebContents() OVERRIDE;
// RenderViewHostDelegate ----------------------------------------------------
@@ -369,17 +379,6 @@
virtual void RouteMessageEvent(
RenderViewHost* rvh,
const ViewMsg_PostMessage_Params& params) OVERRIDE;
- virtual void RunJavaScriptMessage(RenderViewHost* rvh,
- const base::string16& message,
- const base::string16& default_prompt,
- const GURL& frame_url,
- JavaScriptMessageType type,
- IPC::Message* reply_msg,
- bool* did_suppress_message) OVERRIDE;
- virtual void RunBeforeUnloadConfirm(RenderViewHost* rvh,
- const base::string16& message,
- bool is_reload,
- IPC::Message* reply_msg) OVERRIDE;
virtual bool AddMessageToConsole(int32 level,
const base::string16& message,
int32 line_no,
@@ -664,9 +663,10 @@
// watching |web_contents|. No-op if there is no such observer.
void RemoveDestructionObserver(WebContentsImpl* web_contents);
- // Callback function when showing JS dialogs.
- void OnDialogClosed(RenderViewHost* rvh,
+ // Callback function when showing JavaScript dialogs.
+ void OnDialogClosed(RenderFrameHost* rfh,
IPC::Message* reply_msg,
+ bool dialog_was_suppressed,
bool success,
const base::string16& user_input);
@@ -1070,6 +1070,9 @@
// different process from its parent page.
bool is_subframe_;
+ // Whether the last JavaScript dialog shown was suppressed. Used for testing.
+ bool last_dialog_suppressed_;
+
DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
};
