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

Unified Diff: chrome/browser/prerender/prerender_manager.cc

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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/prerender/prerender_contents.cc ('k') | chrome/browser/printing/print_dialog_cloud.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prerender/prerender_manager.cc
diff --git a/chrome/browser/prerender/prerender_manager.cc b/chrome/browser/prerender/prerender_manager.cc
index 52ef74a03a468b591a51e80fdd7ec5e954f43107..c2130928d3c27e23801c8b4340dbcab589dcb5f5 100644
--- a/chrome/browser/prerender/prerender_manager.cc
+++ b/chrome/browser/prerender/prerender_manager.cc
@@ -663,8 +663,8 @@ bool PrerenderManager::MaybeUsePrerenderedPage(TabContents* tab_contents,
MarkTabContentsAsPrerendered(new_tab_contents->tab_contents());
// Merge the browsing history.
- new_tab_contents->tab_contents()->GetController().CopyStateFromAndPrune(
- &old_tab_contents->tab_contents()->GetController());
+ new_tab_contents->tab_contents()->controller().CopyStateFromAndPrune(
+ &old_tab_contents->tab_contents()->controller());
old_tab_contents->core_tab_helper()->delegate()->
SwapTabContents(old_tab_contents, new_tab_contents);
prerender_contents->CommitHistory(new_tab_contents);
« no previous file with comments | « chrome/browser/prerender/prerender_contents.cc ('k') | chrome/browser/printing/print_dialog_cloud.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698