Handle interface to prerenders.

chrome/browser/ui/omnibox/omnibox_edit_model.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
 
 #include <string>
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 1083 matching lines @@
   return false;
 }
 
 void OmniboxEditModel::DoPrerender(const AutocompleteMatch& match) {
   // Do not prerender if the destination URL is the same as the current URL.
   if (match.destination_url == PermanentURL())
     return;
   // It's possible the tab strip does not have an active tab contents, for
   // instance if the tab has been closed or on return from a sleep state
   // (http://crbug.com/105689)
-  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());
+  if (TabContents* tab = controller_->GetTabContents()) {
+    gfx::Rect container_bounds;
+    tab->web_contents()->GetView()->GetContainerBounds(&container_bounds);
+    content::RenderViewHost* current_host =
+        tab->web_contents()->GetRenderViewHost();
+    AutocompleteActionPredictor* action_predictor =
+        AutocompleteActionPredictorFactory::GetForProfile(profile_);
+
+    action_predictor->StartPrerendering(
+        match.destination_url,
+        current_host->GetSessionStorageNamespace(), container_bounds.size());

[mmenke, 2012/07/09 18:06:57]

nit:  Any reason current_host->GetSessionStorageNamespace() was moved onto the
next line?  match.destination_url is shorter than container_bounds.size().

[mmenke, 2012/07/09 18:06:57]

I'll defer to Dominich on whether it makes sense to have the ActionPredirector
decide if we want to prerender, the OmniboxEditModel trigger the prerender, and
the ActionPredirector keep a handle to the prerender.

[dominich, 2012/07/09 18:25:43]

This makes sense and was written after discussion - it means that the
OmniboxEditModel no longer has a dependence on Prerender, but only on the
Predictor. It is then up to the Predictor to know about Prerender.

[mmenke, 2012/07/10 18:01:13]

Thanks for the explanation, sounds reasonable.  Just wanted to make sure someone
had thought about it.

[gavinp, 2012/07/11 17:04:00]

Done.

+  }
 }
 
 void OmniboxEditModel::DoPreconnect(const AutocompleteMatch& match) {
   if (!match.destination_url.SchemeIs(chrome::kExtensionScheme)) {
     // Warm up DNS Prefetch cache, or preconnect to a search service.
     UMA_HISTOGRAM_ENUMERATION("Autocomplete.MatchType", match.type,
                               AutocompleteMatch::NUM_TYPES);
     if (profile_->GetNetworkPredictor()) {
       profile_->GetNetworkPredictor()->AnticipateOmniboxUrl(
           match.destination_url,
@@ skipping 22 matching lines @@
     return metrics::OmniboxEventProto_PageClassification_INVALID_SPEC;
   const std::string& url = gurl.spec();
   if (url == chrome::kChromeUINewTabURL)
     return metrics::OmniboxEventProto_PageClassification_NEW_TAB_PAGE;
   if (url == chrome::kAboutBlankURL)
     return metrics::OmniboxEventProto_PageClassification_BLANK;
   if (url == profile()->GetPrefs()->GetString(prefs::kHomePage))
     return metrics::OmniboxEventProto_PageClassification_HOMEPAGE;
   return metrics::OmniboxEventProto_PageClassification_OTHER;
 }