diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-15 01:05:49 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-15 01:05:49 +0000 |
| commit | e75a633abe1e0fdec531e0ebead1dd10a87a7013 (patch) | |
| tree | 37625ab0445d5b91fe789eabe4b83a8aec42b118 /content/browser | |
| parent | eea70adb356b50280cb5ac8f259ddf9648dc5c3e (diff) | |
| download | chromium_src-e75a633abe1e0fdec531e0ebead1dd10a87a7013.zip chromium_src-e75a633abe1e0fdec531e0ebead1dd10a87a7013.tar.gz chromium_src-e75a633abe1e0fdec531e0ebead1dd10a87a7013.tar.bz2 | |
Revert 85394 - This change broke "PrerenderBrowserTest.PrerenderWindowOpenerJsOpenInNewPageTest" on all platforms.
Original description:
Changes to not use the prerendered contents when window.opener needs to be set.
BUG=79922
TEST=browser_tests
Review URL: http://codereview.chromium.org/6915019
TBR=shishir@chromium.org
Review URL: http://codereview.chromium.org/7022005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85401 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser')
4 files changed, 4 insertions, 12 deletions
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc index 1d23854..d51e63e 100644 --- a/content/browser/tab_contents/tab_contents.cc +++ b/content/browser/tab_contents/tab_contents.cc @@ -1015,7 +1015,6 @@ void TabContents::SetContentRestrictions(int restrictions) { void TabContents::OnDidStartProvisionalLoadForFrame(int64 frame_id, bool is_main_frame, - bool has_opener_set, const GURL& url) { bool is_error_page = (url.spec() == chrome::kUnreachableWebDataURL); GURL validated_url(url); @@ -1033,12 +1032,11 @@ void TabContents::OnDidStartProvisionalLoadForFrame(int64 frame_id, if (is_main_frame) { // Notify observers about the provisional change in the main frame URL. FOR_EACH_OBSERVER(TabContentsObserver, observers_, - ProvisionalChangeToMainFrameUrl(url, has_opener_set)); + ProvisionalChangeToMainFrameUrl(url)); } } void TabContents::OnDidRedirectProvisionalLoad(int32 page_id, - bool has_opener_set, const GURL& source_url, const GURL& target_url) { // TODO(creis): Remove this method and have the pre-rendering code listen to @@ -1054,8 +1052,7 @@ void TabContents::OnDidRedirectProvisionalLoad(int32 page_id, // Notify observers about the provisional change in the main frame URL. FOR_EACH_OBSERVER(TabContentsObserver, observers_, - ProvisionalChangeToMainFrameUrl(target_url, - has_opener_set)); + ProvisionalChangeToMainFrameUrl(target_url)); } void TabContents::OnDidFailProvisionalLoadWithError( diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h index 6f70175..f38ca63 100644 --- a/content/browser/tab_contents/tab_contents.h +++ b/content/browser/tab_contents/tab_contents.h @@ -603,10 +603,8 @@ class TabContents : public PageNavigator, // Message handlers. void OnDidStartProvisionalLoadForFrame(int64 frame_id, bool main_frame, - bool has_opener_set, const GURL& url); void OnDidRedirectProvisionalLoad(int32 page_id, - bool has_opener_set, const GURL& source_url, const GURL& target_url); void OnDidFailProvisionalLoadWithError(int64 frame_id, diff --git a/content/browser/tab_contents/tab_contents_observer.cc b/content/browser/tab_contents/tab_contents_observer.cc index 50b2e46..3056608 100644 --- a/content/browser/tab_contents/tab_contents_observer.cc +++ b/content/browser/tab_contents/tab_contents_observer.cc @@ -48,9 +48,7 @@ void TabContentsObserver::DidStartProvisionalLoadForFrame( RenderViewHost* render_view_host) { } -void TabContentsObserver::ProvisionalChangeToMainFrameUrl( - const GURL& url, - bool has_opener_set) { +void TabContentsObserver::ProvisionalChangeToMainFrameUrl(const GURL& url) { } void TabContentsObserver::DidCommitProvisionalLoadForFrame( diff --git a/content/browser/tab_contents/tab_contents_observer.h b/content/browser/tab_contents/tab_contents_observer.h index 03760f7..cc73b4f 100644 --- a/content/browser/tab_contents/tab_contents_observer.h +++ b/content/browser/tab_contents/tab_contents_observer.h @@ -56,8 +56,7 @@ class TabContentsObserver : public IPC::Channel::Listener, const GURL& validated_url, bool is_error_page, RenderViewHost* render_view_host); - virtual void ProvisionalChangeToMainFrameUrl(const GURL& url, - bool has_opener_set); + virtual void ProvisionalChangeToMainFrameUrl(const GURL& url); virtual void DidCommitProvisionalLoadForFrame( int64 frame_id, bool is_main_frame, |