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

Unified Diff: ios/chrome/browser/ui/browser_view_controller.mm

Issue 2745873002: Created NavigationManager::CopyStateFromAndPrune(). (Closed)
Patch Set: comment fix Created 3 years, 9 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
Index: ios/chrome/browser/ui/browser_view_controller.mm
diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm
index 6a4a6377932b8bb80bc74322b25a863d130bcf91..9d1a6bfb421b1fd72832044152a7b607ab025501 100644
--- a/ios/chrome/browser/ui/browser_view_controller.mm
+++ b/ios/chrome/browser/ui/browser_view_controller.mm
@@ -3678,15 +3678,15 @@ - (void)loadURL:(const GURL&)url
Tab* newTab = [_preloadController releasePrerenderContents];
DCHECK(oldTab);
DCHECK(newTab);
- if (oldTab && newTab) {
+ BOOL canPruneItems =
Eugene But (OOO till 7-30) 2017/03/15 19:54:51 s/BOOL/bool
kkhorimoto 2017/03/15 21:04:38 Done.
+ [newTab navigationManager]->CanPruneAllButLastCommittedItem();
+ if (oldTab && newTab && canPruneItems) {
[oldTab recordStateInHistory];
- DCHECK([newTab navigationManager]);
CRWSessionController* newHistory =
[newTab navigationManagerImpl]->GetSessionController();
- DCHECK([oldTab navigationManager]);
CRWSessionController* oldHistory =
[oldTab navigationManagerImpl]->GetSessionController();
- [newHistory insertStateFromSessionController:oldHistory];
+ [newHistory copyStateFromSessionControllerAndPrune:oldHistory];
[[newTab nativeAppNavigationController]
copyStateFrom:[oldTab nativeAppNavigationController]];
[_model replaceTab:oldTab withTab:newTab];
« no previous file with comments | « no previous file | ios/web/navigation/crw_session_controller.h » ('j') | ios/web/navigation/crw_session_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698