| Index: chrome/browser/tab_contents/navigation_controller.cc
|
| ===================================================================
|
| --- chrome/browser/tab_contents/navigation_controller.cc (revision 8302)
|
| +++ chrome/browser/tab_contents/navigation_controller.cc (working copy)
|
| @@ -1010,18 +1010,9 @@
|
| 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 && from_contents != contents && 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());
|
| - }
|
| - }
|
| -
|
| NavigationEntry temp_entry(*pending_entry_);
|
| if (!contents->NavigateToPendingEntry(reload))
|
| DiscardNonCommittedEntries();
|
|
|