summaryrefslogtreecommitdiffstats
path: root/chrome/browser/navigation_controller.cc
diff options
context:
space:
mode:
authorwtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-04 16:40:10 +0000
committerwtc@google.com <wtc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-04 16:40:10 +0000
commita0450d99639727ee41ea036bcde09a61d790735a (patch)
tree31027d931386e623cfa914c35a6244f435fae5d7 /chrome/browser/navigation_controller.cc
parent6d24d3e1ea16b74601eb7381a7d8f1dc3bd521a9 (diff)
downloadchromium_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/navigation_controller.cc')
-rw-r--r--chrome/browser/navigation_controller.cc7
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/navigation_controller.cc b/chrome/browser/navigation_controller.cc
index c944d99..2dfc9b3 100644
--- a/chrome/browser/navigation_controller.cc
+++ b/chrome/browser/navigation_controller.cc
@@ -850,13 +850,6 @@ void NavigationController::LoadIfNecessary() {
NavigateToPendingEntry(false);
}
-void NavigationController::ResetInternal() {
- // WARNING: this is invoked from the destructor, be sure not to invoke any
- // virtual methods from this.
- entries_.clear();
- DiscardPendingEntryInternal();
-}
-
void NavigationController::NotifyEntryChanged(const NavigationEntry* entry,
int index) {
EntryChangedDetails det;