diff options
| -rw-r--r-- | chrome/browser/tab_contents/navigation_controller.cc | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/chrome/browser/tab_contents/navigation_controller.cc b/chrome/browser/tab_contents/navigation_controller.cc index e9dd832..9fb1be6 100644 --- a/chrome/browser/tab_contents/navigation_controller.cc +++ b/chrome/browser/tab_contents/navigation_controller.cc @@ -1010,17 +1010,8 @@ void NavigationController::NavigateToPendingEntry(bool reload) { contents->set_is_active(true); active_contents_ = contents; - if (from_contents && from_contents != contents) { - if (from_contents->delegate()) - from_contents->delegate()->ReplaceContents(from_contents, contents); - - if (from_contents->type() != contents->type()) { - // The entry we just discarded needed a different TabContents type. We no - // longer need it but we can't destroy it just yet because the TabContents - // is very likely involved in the current stack. - ScheduleTabContentsCollection(from_contents->type()); - } - } + if (from_contents && from_contents != contents && from_contents->delegate()) + from_contents->delegate()->ReplaceContents(from_contents, contents); NavigationEntry temp_entry(*pending_entry_); if (!contents->NavigateToPendingEntry(reload)) |