Index: chrome/browser/tab_contents/navigation_controller.h |
=================================================================== |
--- chrome/browser/tab_contents/navigation_controller.h (revision 21500) |
+++ chrome/browser/tab_contents/navigation_controller.h (working copy) |
@@ -475,9 +475,9 @@ |
// contents. |
void FinishRestore(int selected_index); |
- // Inserts a new entry or replaces the current entry with a new one, removing |
- // all entries after it. The new entry will become the active one. |
- void InsertOrReplaceEntry(NavigationEntry* entry, bool replace); |
+ // Inserts an entry after the current position, removing all entries after it. |
+ // The new entry will become the active one. |
+ void InsertEntry(NavigationEntry* entry); |
// Discards the pending and transient entries without updating |
// active_contents_. |
Property changes on: chrome\browser\tab_contents\navigation_controller.h |
___________________________________________________________________ |
Modified: svn:mergeinfo |
Reverse-merged /trunk/src/chrome/browser/tab_contents/navigation_controller.h:r14162,14665,15308,15810,15899,15950,16015,16808,18093,18210,18321,18640,18871,19044,19692 |