diff options
| author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 19:58:38 +0000 |
|---|---|---|
| committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-28 19:58:38 +0000 |
| commit | f649450a930b11d0d246c30f1329cb6ae74cd52d (patch) | |
| tree | bc3b29bc002a33f0129b4b46263c37ef9541cacb /content/browser/web_contents/web_contents_impl.h | |
| parent | b4c8401c358ce6a73791da1fedcfb7f831503b18 (diff) | |
| download | chromium_src-f649450a930b11d0d246c30f1329cb6ae74cd52d.zip chromium_src-f649450a930b11d0d246c30f1329cb6ae74cd52d.tar.gz chromium_src-f649450a930b11d0d246c30f1329cb6ae74cd52d.tar.bz2 | |
Ensure that modal dialogs from subframes can be cleaned up correctly.
BUG=366510
TEST=See bug comment 7 for repro steps.
Review URL: https://codereview.chromium.org/255543009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266638 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/web_contents/web_contents_impl.h')
| -rw-r--r-- | content/browser/web_contents/web_contents_impl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index 610f828..d275e5c 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -670,8 +670,11 @@ class CONTENT_EXPORT WebContentsImpl // watching |web_contents|. No-op if there is no such observer. void RemoveDestructionObserver(WebContentsImpl* web_contents); - // Callback function when showing JavaScript dialogs. - void OnDialogClosed(RenderFrameHost* rfh, + // Callback function when showing JavaScript dialogs. Takes in a routing ID + // pair to identify the RenderFrameHost that opened the dialog, because it's + // possible for the RenderFrameHost to be deleted by the time this is called. + void OnDialogClosed(int render_process_id, + int render_frame_id, IPC::Message* reply_msg, bool dialog_was_suppressed, bool success, |