diff options
| author | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-28 22:10:17 +0000 |
|---|---|---|
| committer | brettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-28 22:10:17 +0000 |
| commit | ecd9d87092866d04c00b5695ac56f0a026a6a2c8 (patch) | |
| tree | 8af05cf2b9c524db3d40a7007ed5ec137a820d12 /chrome/browser/tab_contents.h | |
| parent | 7ea9cbb1f61ea1b6990011d076bc09c05b9e72e8 (diff) | |
| download | chromium_src-ecd9d87092866d04c00b5695ac56f0a026a6a2c8.zip chromium_src-ecd9d87092866d04c00b5695ac56f0a026a6a2c8.tar.gz chromium_src-ecd9d87092866d04c00b5695ac56f0a026a6a2c8.tar.bz2 | |
Make a step on refactoring navigation. The eventual plan is to have the NavigationController create and commit the new NavigationEntries (currently WebContents does a bunch of the details of this which is hard to understand and not easily testable).
This tries to consolidate the logic that I want to move to the NavigationController without actually moving it there yet. I removed all of the "PreCommit" functions in WebContents, since when the NavigationController does
all of the committing, there won't be a phase where the NavigationEntry exists but isn't committed.
Most of the logic could be moved to the PostCommit functions without any problem, which is an indication that the current design was busted anyway. I had to precompute some data and pass it to the *PostCommit function to work around some of the components that required old data. I had to change InfoBars around since it relied on having both the committed and uncommitted entries, but I think the new design is much better anyway.
BUG=1343593,1343146
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1506 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents.h')
| -rw-r--r-- | chrome/browser/tab_contents.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents.h b/chrome/browser/tab_contents.h index 9d117a5..7d0f784 100644 --- a/chrome/browser/tab_contents.h +++ b/chrome/browser/tab_contents.h @@ -489,8 +489,11 @@ class TabContents : public PageNavigator, void SetIsLoading(bool is_loading, LoadNotificationDetails* details); // Called by subclasses when a navigation occurs. Ownership of the entry - // object is passed to this method. - void DidNavigateToEntry(NavigationEntry* entry); + // object is passed to this method. The details object should be filled in + // *except* for the entry (which the NavigationController will set). This + // behaves the same as NavigationController::DidNavigate, see that for more. + void DidNavigateToEntry(NavigationEntry* entry, + NavigationController::LoadCommittedDetails* details); // Called by a derived class when the TabContents is resized, causing // suppressed constrained web popups to be repositioned to the new bounds |