From 57b58ca1ae8ed2524fd6d4327c3e994f556bfbd3 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Tue, 26 Feb 2013 23:41:25 +0000 Subject: Don't call NavigationController::PruneAllButActive just before NavigationController::CopyStateFromAndPrune The latter invokes the former internally anyway BUG=178103 TEST=nothing should change R=creis@chromium.org,sreeram@chromium.org Review URL: https://chromiumcodereview.appspot.com/12335094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184771 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/browser_instant_controller.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'chrome/browser/ui/browser_instant_controller.cc') diff --git a/chrome/browser/ui/browser_instant_controller.cc b/chrome/browser/ui/browser_instant_controller.cc index 5a15dc9..c9a6089 100644 --- a/chrome/browser/ui/browser_instant_controller.cc +++ b/chrome/browser/ui/browser_instant_controller.cc @@ -114,7 +114,6 @@ bool BrowserInstantController::MaybeSwapInInstantNTPContents( return false; *target_contents = instant_ntp.get(); - instant_ntp->GetController().PruneAllButActive(); if (source_contents) { instant_ntp->GetController().CopyStateFromAndPrune( &source_contents->GetController()); @@ -122,6 +121,7 @@ bool BrowserInstantController::MaybeSwapInInstantNTPContents( browser_->tab_strip_model()->GetIndexOfWebContents(source_contents), instant_ntp.Pass()); } else { + instant_ntp->GetController().PruneAllButActive(); // If |source_contents| is NULL, then the caller is responsible for // inserting instant_ntp into the tabstrip and will take ownership. ignore_result(instant_ntp.release()); -- cgit v1.1