diff options
author | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 15:37:15 +0000 |
---|---|---|
committer | creis@chromium.org <creis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-12 15:37:15 +0000 |
commit | 992db4c20a063a1009ae28c2cfb5b220701ea301 (patch) | |
tree | 570549ba54be36ea4b81ef446791e1d2e546e6f9 /content/browser/renderer_host/render_view_host_delegate.h | |
parent | 08c5fe5d62ec33cd7215bcdcd532d83866076580 (diff) | |
download | chromium_src-992db4c20a063a1009ae28c2cfb5b220701ea301.zip chromium_src-992db4c20a063a1009ae28c2cfb5b220701ea301.tar.gz chromium_src-992db4c20a063a1009ae28c2cfb5b220701ea301.tar.bz2 |
Support window.opener after a process swap.
Changes:
1. Swap out RVHs instead of closing them, so we can return to the same Frame object if we later come back.
2. Filter out messages from swapped out RVHs, in case any are in-flight.
3. Remove the workaround for navigating away from an app.
4. Update tests to reflect the new sequence of events.
BUG=65953
TEST=AppApiTest.AppProcess
TEST=ResourceDispatcherTest.CrossSiteImmediateLoadOnunloadCookie
Review URL: http://codereview.chromium.org/6319001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85134 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/renderer_host/render_view_host_delegate.h')
-rw-r--r-- | content/browser/renderer_host/render_view_host_delegate.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h index 9e8cb54..cb48801 100644 --- a/content/browser/renderer_host/render_view_host_delegate.h +++ b/content/browser/renderer_host/render_view_host_delegate.h @@ -476,14 +476,16 @@ class RenderViewHostDelegate : public IPC::Channel::Listener { const std::string& target) {} // A javascript message, confirmation or prompt should be shown. - virtual void RunJavaScriptMessage(const std::wstring& message, + virtual void RunJavaScriptMessage(const RenderViewHost* rvh, + const std::wstring& message, const std::wstring& default_prompt, const GURL& frame_url, const int flags, IPC::Message* reply_msg, bool* did_suppress_message) {} - virtual void RunBeforeUnloadConfirm(const std::wstring& message, + virtual void RunBeforeUnloadConfirm(const RenderViewHost* rvh, + const std::wstring& message, IPC::Message* reply_msg) {} // |url| is assigned to a server that can provide alternate error pages. If |