summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl_blocking_page.cc
diff options
context:
space:
mode:
authorbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-28 22:10:17 +0000
committerbrettw@google.com <brettw@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-28 22:10:17 +0000
commitecd9d87092866d04c00b5695ac56f0a026a6a2c8 (patch)
tree8af05cf2b9c524db3d40a7007ed5ec137a820d12 /chrome/browser/ssl_blocking_page.cc
parent7ea9cbb1f61ea1b6990011d076bc09c05b9e72e8 (diff)
downloadchromium_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/ssl_blocking_page.cc')
-rw-r--r--chrome/browser/ssl_blocking_page.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/ssl_blocking_page.cc b/chrome/browser/ssl_blocking_page.cc
index db0f684..a8f5152 100644
--- a/chrome/browser/ssl_blocking_page.cc
+++ b/chrome/browser/ssl_blocking_page.cc
@@ -153,7 +153,10 @@ void SSLBlockingPage::Show() {
nav_entry->ssl().set_cert_status(ssl_info.cert_status);
nav_entry->ssl().set_security_bits(ssl_info.security_bits);
// The controller will own the entry.
- tab_->controller()->DidNavigateToEntry(nav_entry);
+
+ // The default details is "new navigation", and that's OK with us.
+ NavigationController::LoadCommittedDetails details;
+ tab_->controller()->DidNavigateToEntry(nav_entry, &details);
tab->ShowInterstitialPage(html_text, NULL);
}