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

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

Issue 3415026: Makes instant support other open dispositions. (Closed)
Patch Set: Merge and prune Created 10 years, 3 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 | « chrome/browser/tab_contents/match_preview.cc ('k') | 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
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h
index 574425a16300be471a685f6125f9cdf8c7a8ecf5..24a206f192fb55ee10ab96ec5d37d2d972cd6639 100644
--- a/chrome/browser/tab_contents/navigation_controller.h
+++ b/chrome/browser/tab_contents/navigation_controller.h
@@ -374,6 +374,10 @@ class NavigationController {
// This ignores the transient index of the source and honors that of 'this'.
void CopyStateFromAndPrune(const NavigationController& source);
+ // Removes all the entries except the active entry. If there is a new pending
+ // navigation it is preserved.
+ void PruneAllButActive();
+
// Random data ---------------------------------------------------------------
// Returns the identifier used by session restore.
@@ -517,10 +521,6 @@ class NavigationController {
const std::vector<TabNavigation>& navigations,
std::vector<linked_ptr<NavigationEntry> >* entries);
- // Removes all the entries except the active entry. If there is a new pending
- // navigation it is preserved.
- void PruneAllButActive();
-
// Inserts up to |max_index| entries from |source| into this. This does NOT
// adjust any of the members that reference entries_
// (last_committed_entry_index_, pending_entry_index_ or
« no previous file with comments | « chrome/browser/tab_contents/match_preview.cc ('k') | chrome/browser/tab_contents/navigation_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698