diff options
| author | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 16:40:10 +0000 |
|---|---|---|
| committer | wtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-04 16:40:10 +0000 |
| commit | a0450d99639727ee41ea036bcde09a61d790735a (patch) | |
| tree | 31027d931386e623cfa914c35a6244f435fae5d7 /chrome/browser/web_contents.cc | |
| parent | 6d24d3e1ea16b74601eb7381a7d8f1dc3bd521a9 (diff) | |
| download | chromium_src-a0450d99639727ee41ea036bcde09a61d790735a.zip chromium_src-a0450d99639727ee41ea036bcde09a61d790735a.tar.gz chromium_src-a0450d99639727ee41ea036bcde09a61d790735a.tar.bz2 | |
Clean up brettw's checkin of r1032.
Fix a DCHECK on ssl().content_status() in web_contents.cc.
Remove the unused ResetInternal method of NavigationController.
R=brettw
Review URL: http://codereview.chromium.org/221
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/web_contents.cc')
| -rw-r--r-- | chrome/browser/web_contents.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/web_contents.cc b/chrome/browser/web_contents.cc index 2367a9b..01cd7ae 100644 --- a/chrome/browser/web_contents.cc +++ b/chrome/browser/web_contents.cc @@ -1318,7 +1318,7 @@ NavigationEntry* WebContents::CreateNavigationEntryForCommit( // that state. We should find a better way to do this. Note that it is OK // that the mixed/unsafe contents is set on the wrong navigation entry, as // that state is reset when navigating back to it. - DCHECK(last_committed->ssl().content_status() == 0) << "We should never " + DCHECK(entry->ssl().content_status() == 0) << "We should never " "be setting the status bits from 1 to 0 on navigate."; entry->ssl() = last_committed->ssl(); } |