diff options
| author | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-14 15:11:02 +0000 |
|---|---|---|
| committer | gavinp@chromium.org <gavinp@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-14 15:11:02 +0000 |
| commit | 5463c700e47a3beac464d95b251335bd90145a4d (patch) | |
| tree | 31278200af813860369b5210e7d798edc850e6ad /chrome/browser/ui | |
| parent | e88ff89bb0979a4d3321f9affef7d88f93fcc231 (diff) | |
| download | chromium_src-5463c700e47a3beac464d95b251335bd90145a4d.zip chromium_src-5463c700e47a3beac464d95b251335bd90145a4d.tar.gz chromium_src-5463c700e47a3beac464d95b251335bd90145a4d.tar.bz2 | |
Handle interface to prerenders.
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146735 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/omnibox/omnibox_edit_model.cc | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index 5661042..51282ac 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -1122,18 +1122,13 @@ 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); - prerender_manager->AddPrerenderFromOmnibox( - match.destination_url, current_host->GetSessionStorageNamespace(), - container_bounds.size()); + AutocompleteActionPredictorFactory::GetForProfile(profile_)-> + StartPrerendering(match.destination_url, + tab->web_contents()->GetRenderViewHost()-> + GetSessionStorageNamespace(), + container_bounds.size()); } void OmniboxEditModel::DoPreconnect(const AutocompleteMatch& match) { |