diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 05:23:27 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-02 05:23:27 +0000 |
| commit | 3f19f1a0a393cd620ddb72a7901c5e192cd5ede1 (patch) | |
| tree | a3c73551fabd48a0c06462f5c463bdd0552989f1 /content/browser/web_contents/web_contents_impl.cc | |
| parent | 1d1349296bae4d37571dcda5eabaa9e1f882b3e4 (diff) | |
| download | chromium_src-3f19f1a0a393cd620ddb72a7901c5e192cd5ede1.zip chromium_src-3f19f1a0a393cd620ddb72a7901c5e192cd5ede1.tar.gz chromium_src-3f19f1a0a393cd620ddb72a7901c5e192cd5ede1.tar.bz2 | |
Move didDisownOpener to RenderFrame.
BUG=361761
TEST=no visible change
Review URL: https://codereview.chromium.org/265773009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/web_contents/web_contents_impl.cc')
| -rw-r--r-- | content/browser/web_contents/web_contents_impl.cc | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc index 7d86a5f1..fea916e 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc @@ -3419,20 +3419,6 @@ void WebContentsImpl::DidChangeLoadProgress(double progress) { delegate_->LoadProgressChanged(this, progress); } -void WebContentsImpl::DidDisownOpener(RenderViewHost* rvh) { - if (opener_) { - // Clear our opener so that future cross-process navigations don't have an - // opener assigned. - RemoveDestructionObserver(opener_); - opener_ = NULL; - } - - // Notify all swapped out RenderViewHosts for this tab. This is important - // in case we go back to them, or if another window in those processes tries - // to access window.opener. - GetRenderManager()->DidDisownOpener(rvh); -} - void WebContentsImpl::DidAccessInitialDocument() { has_accessed_initial_document_ = true; @@ -3446,6 +3432,20 @@ void WebContentsImpl::DidAccessInitialDocument() { NotifyNavigationStateChanged(content::INVALIDATE_TYPE_URL); } +void WebContentsImpl::DidDisownOpener(RenderFrameHost* render_frame_host) { + if (opener_) { + // Clear our opener so that future cross-process navigations don't have an + // opener assigned. + RemoveDestructionObserver(opener_); + opener_ = NULL; + } + + // Notify all swapped out RenderViewHosts for this tab. This is important + // in case we go back to them, or if another window in those processes tries + // to access window.opener. + GetRenderManager()->DidDisownOpener(render_frame_host->GetRenderViewHost()); +} + void WebContentsImpl::DocumentAvailableInMainFrame( RenderViewHost* render_view_host) { FOR_EACH_OBSERVER(WebContentsObserver, observers_, |