diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 01:02:46 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 01:02:46 +0000 |
| commit | 1be69aa0ed94b85870485aa090cf73e31b94dc79 (patch) | |
| tree | 8a8006f2511af5f07e1764a086ab11de26adf5c7 /chrome/browser/tab_contents/test_tab_contents.h | |
| parent | a0ddf29301017291854f477c02c180bf349b9e1c (diff) | |
| download | chromium_src-1be69aa0ed94b85870485aa090cf73e31b94dc79.zip chromium_src-1be69aa0ed94b85870485aa090cf73e31b94dc79.tar.gz chromium_src-1be69aa0ed94b85870485aa090cf73e31b94dc79.tar.bz2 | |
Revert "Don't create pending entries when a navigation is initiated by the page."
TBR=jcivelli
Review URL: http://codereview.chromium.org/3360003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58289 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/test_tab_contents.h')
| -rw-r--r-- | chrome/browser/tab_contents/test_tab_contents.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/chrome/browser/tab_contents/test_tab_contents.h b/chrome/browser/tab_contents/test_tab_contents.h index 21bc096..f0750d7 100644 --- a/chrome/browser/tab_contents/test_tab_contents.h +++ b/chrome/browser/tab_contents/test_tab_contents.h @@ -20,7 +20,7 @@ class TestTabContents : public TabContents { // The render view host factory will be passed on to the TestTabContents(Profile* profile, SiteInstance* instance); - TestRenderViewHost* pending_rvh() const; + TestRenderViewHost* pending_rvh(); // State accessor. bool cross_navigation_pending() { @@ -62,15 +62,6 @@ class TestTabContents : public TabContents { // emulates what happens on a new navigation. void NavigateAndCommit(const GURL& url); - // Simulates the appropriate RenderView (pending if any, current otherwise) - // sending a navigate notification for the NavigationController pending entry. - void CommitPendingNavigation(); - - // Simulates the current RVH notifying that it has unloaded so that the - // pending RVH navigation can proceed. - // Does nothing if no cross-navigation is pending. - void ProceedWithCrossSiteNavigation(); - // Set by individual tests. bool transition_cross_site; |