From 1c7fa0a26fed6f48fbb2a7fe5724c5f9143610ff Mon Sep 17 00:00:00 2001 From: "gavinp@chromium.org" Date: Sat, 14 Jul 2012 15:20:42 +0000 Subject: Revert 146735 - Handle interface to prerenders. It broke the windows aura build, which isn't on standard tries. The prerender_manager now returns a PrerenderHandle* when creating a prerender; this is a useful object for canceling the prerender, as well as signaling navigation, etc... BUG=None Review URL: https://chromiumcodereview.appspot.com/10553029 TBR=gavinp@chromium.org Review URL: https://chromiumcodereview.appspot.com/10783013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146736 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/ui/omnibox/omnibox_edit_model.cc | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'chrome/browser/ui/omnibox') diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index 51282ac..5661042 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -1122,13 +1122,18 @@ void OmniboxEditModel::DoPrerender(const AutocompleteMatch& match) { TabContents* tab = controller_->GetTabContents(); if (!tab) return; + prerender::PrerenderManager* prerender_manager = + prerender::PrerenderManagerFactory::GetForProfile(tab->profile()); + if (!prerender_manager) + return; + + content::RenderViewHost* current_host = + tab->web_contents()->GetRenderViewHost(); gfx::Rect container_bounds; tab->web_contents()->GetView()->GetContainerBounds(&container_bounds); - AutocompleteActionPredictorFactory::GetForProfile(profile_)-> - StartPrerendering(match.destination_url, - tab->web_contents()->GetRenderViewHost()-> - GetSessionStorageNamespace(), - container_bounds.size()); + prerender_manager->AddPrerenderFromOmnibox( + match.destination_url, current_host->GetSessionStorageNamespace(), + container_bounds.size()); } void OmniboxEditModel::DoPreconnect(const AutocompleteMatch& match) { -- cgit v1.1