Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: chrome/browser/tab_contents/navigation_controller.h

Issue 159329: Revert 19923 - Merge r15950.... (Closed) Base URL: svn://chrome-svn/chrome/branches/172/src/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/tab_contents/navigation_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « no previous file | chrome/browser/tab_contents/navigation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698