Added prerendering to omnibox.

chrome/browser/instant/instant_controller.cc

 // Copyright (c) 2011 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/instant/instant_controller.h"
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/instant/instant_delegate.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_loader_manager.h"
 #include "chrome/browser/instant/promo_counter.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/renderer_host/render_widget_host_view.h"
@@ skipping 132 matching lines @@
   commit_on_mouse_up_ = false;
   last_transition_type_ = match.transition;
   const TemplateURL* template_url = NULL;
 
   if (url.is_empty() || !url.is_valid()) {
     // Assume we were invoked with GURL() and should destroy all.
     DestroyPreviewContents();
     return;
   }
 
-  if (!ShouldShowPreviewFor(match, &template_url)) {
+  PreviewCondition preview_condition = ShouldShowPreviewFor(match,
+                                                            &template_url);
+  if (preview_condition == PREVIEW_CONDITION_SUCCESS) {
+    // Do nothing if we should show it.
+  } else {

[sky, 2011/06/20 20:53:49]

combine else and if, eg:
else if (previw_condition == 

[dominich, 2011/06/20 21:02:36]

Done.

+    if (preview_condition == PREVIEW_CONDITION_INSTANT_SEARCH_ONLY) {
+      // Start Prerender of this page instead.
+      CommandLine* cl = CommandLine::ForCurrentProcess();
+      if (cl->HasSwitch(switches::kPrerenderFromOmnibox)) {
+        prerender::PrerenderManager* prerender_manager =
+            tab_contents_->profile()->GetPrerenderManager();
+        if (prerender_manager)
+          prerender_manager->AddPrerenderWithNoTag(match.destination_url);
+      }
+    }
+
     DestroyPreviewContentsAndLeaveActive();
     return;
   }
 
   if (!loader_manager_.get())
     loader_manager_.reset(new InstantLoaderManager(this));
 
   if (!is_active_) {
     is_active_ = true;
     delegate_->PrepareForInstant();
@@ skipping 473 matching lines @@
     show_timer_.Stop();
     if (!new_loader->http_status_ok()) {
       show_timer_.Start(
           base::TimeDelta::FromMilliseconds(kShowDelayMS),
           this, &InstantController::ShowTimerFired);
     }
   }
   UpdateDisplayableLoader();
 }
 
-bool InstantController::ShouldShowPreviewFor(const AutocompleteMatch& match,
-                                             const TemplateURL** template_url) {
+InstantController::PreviewCondition InstantController::ShouldShowPreviewFor(
+    const AutocompleteMatch& match, const TemplateURL** template_url) {
   const TemplateURL* t_url = GetTemplateURL(match);
   if (t_url) {
     if (!t_url->id() ||
         !t_url->instant_url() ||
         IsBlacklistedFromInstant(t_url->id()) ||
         !t_url->instant_url()->SupportsReplacement()) {
       // To avoid extra load on other search engines we only enable previews if
       // they support the instant API.
-      return false;
+      return PREVIEW_CONDITION_INVALID_TEMPLATE_URL;
     }
   }
   *template_url = t_url;
 
   if (match.destination_url.SchemeIs(chrome::kJavaScriptScheme))
-    return false;
+    return PREVIEW_CONDITION_JAVASCRIPT_SCHEME;
 
-  // Extension keywords don't have a real destionation URL.
+  // Extension keywords don't have a real destination URL.
   if (match.template_url && match.template_url->IsExtensionKeyword())
-    return false;
+    return PREVIEW_CONDITION_EXTENSION_KEYWORD;
 
   // Was the host blacklisted?
   if (host_blacklist_ && host_blacklist_->count(match.destination_url.host()))
-    return false;
+    return PREVIEW_CONDITION_BLACKLISTED;
 
   const CommandLine* cl = CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kRestrictInstantToSearch) &&
       match.type != AutocompleteMatch::SEARCH_WHAT_YOU_TYPED &&
       match.type != AutocompleteMatch::SEARCH_HISTORY &&
       match.type != AutocompleteMatch::SEARCH_SUGGEST &&
       match.type != AutocompleteMatch::SEARCH_OTHER_ENGINE) {
-    return false;
+    return PREVIEW_CONDITION_INSTANT_SEARCH_ONLY;
   }
 
-  return true;
+  return PREVIEW_CONDITION_SUCCESS;
 }
 
 void InstantController::BlacklistFromInstant(TemplateURLID id) {
   blacklisted_ids_.insert(id);
 }
 
 bool InstantController::IsBlacklistedFromInstant(TemplateURLID id) {
   return blacklisted_ids_.count(id) > 0;
 }
 
@@ skipping 19 matching lines @@
   const TemplateURL* template_url = match.template_url;
   if (match.type == AutocompleteMatch::SEARCH_WHAT_YOU_TYPED ||
       match.type == AutocompleteMatch::SEARCH_HISTORY ||
       match.type == AutocompleteMatch::SEARCH_SUGGEST) {
     TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(
         tab_contents_->profile());
     template_url = model ? model->GetDefaultSearchProvider() : NULL;
   }
   return template_url;
 }