Added prerendering to omnibox.

chrome/browser/autocomplete/autocomplete_edit.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/autocomplete/autocomplete_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_model.h"
 #include "chrome/browser/autocomplete/autocomplete_popup_view.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/autocomplete/search_provider.h"
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/extensions/extension_omnibox_api.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/instant/instant_controller.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/net/url_fixer_upper.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/browser_list.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/notification_service.h"
 #include "googleurl/src/gurl.h"
 #include "googleurl/src/url_util.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 // AutocompleteEditController
 
@@ skipping 29 matching lines @@
       popup_(NULL),
       controller_(controller),
       has_focus_(false),
       user_input_in_progress_(false),
       just_deleted_text_(false),
       has_temporary_text_(false),
       paste_state_(NONE),
       control_key_state_(UP),
       is_keyword_hint_(false),
       profile_(profile),
-      update_instant_(true),
+      in_revert_(false),
       allow_exact_keyword_match_(false),
       instant_complete_behavior_(INSTANT_COMPLETE_DELAYED) {
 }
 
 AutocompleteEditModel::~AutocompleteEditModel() {
 }
 
 void AutocompleteEditModel::SetProfile(Profile* profile) {
   DCHECK(profile);
   profile_ = profile;
@@ skipping 113 matching lines @@
 
 bool AutocompleteEditModel::AcceptCurrentInstantPreview() {
   return InstantController::CommitIfCurrent(controller_->GetInstant());
 }
 
 void AutocompleteEditModel::OnChanged() {
   InstantController* instant = controller_->GetInstant();
   string16 suggested_text;
   TabContentsWrapper* tab = controller_->GetTabContentsWrapper();
   bool might_support_instant = false;
-  if (update_instant_ && instant && tab) {
-    if (user_input_in_progress() && popup_->IsOpen()) {
-      AutocompleteMatch current_match = CurrentMatch();
-      if (current_match.destination_url == PermanentURL()) {
-        // The destination is the same as the current url. This typically
-        // happens if the user presses the down error in the omnibox, in which
-        // case we don't want to load a preview.
-        instant->DestroyPreviewContentsAndLeaveActive();
+  if (!in_revert_ && tab) {
+    if (instant) {
+      if (user_input_in_progress() && popup_->IsOpen()) {
+        AutocompleteMatch current_match = CurrentMatch();
+        if (current_match.destination_url == PermanentURL()) {
+          // The destination is the same as the current url. This typically
+          // happens if the user presses the down error in the omnibox, in which
+          // case we don't want to load a preview.
+          instant->DestroyPreviewContentsAndLeaveActive();
+        } else {
+          instant->Update(tab, current_match, view_->GetText(),
+                          UseVerbatimInstant(), &suggested_text);
+        }
       } else {
-        instant->Update(tab, CurrentMatch(), view_->GetText(),
-                        UseVerbatimInstant(), &suggested_text);
+        instant->DestroyPreviewContents();
       }
-    } else {
-      instant->DestroyPreviewContents();
+      might_support_instant = instant->MightSupportInstant();
+    } else if (user_input_in_progress() && popup_->IsOpen()) {
+      // Start Prerender of this page instead.
+      CommandLine* cl = CommandLine::ForCurrentProcess();
+      if (cl->HasSwitch(switches::kPrerenderFromOmnibox)) {

[cbentzel, 2011/06/22 17:27:32]

Move the command-line check be moved into
PrerenderManager::AddPrerenderWithNoTag - it's done in more than one caller
location, and hides more prerender logic from autocomplete/omnibox. 

[dominich, 2011/06/22 19:00:51]

Done.

+        CHECK(tab->tab_contents());
+        prerender::PrerenderManager* prerender_manager =
+            tab->tab_contents()->profile()->GetPrerenderManager();
+        if (prerender_manager) {
+          prerender_manager->AddPrerenderWithNoTag(
+              prerender::ORIGIN_OMNIBOX,
+              CurrentMatch().destination_url);
+        }
+      }
     }
-    might_support_instant = instant->MightSupportInstant();
   }
 
   if (!might_support_instant) {
     // Hide any suggestions we might be showing.
     view_->SetInstantSuggestion(string16(), false);
 
     // No need to wait any longer for instant.
     FinalizeInstantQuery(string16(), string16(), false);
   } else {
     SetSuggestedText(suggested_text, instant_complete_behavior_);
@@ skipping 150 matching lines @@
   autocomplete_controller_->Start(
       user_text_, GetDesiredTLD(),
       prevent_inline_autocomplete || just_deleted_text_ ||
       (has_selected_text && inline_autocomplete_text_.empty()) ||
       (paste_state_ != NONE), keyword_is_selected,
       keyword_is_selected || allow_exact_keyword_match_,
       AutocompleteInput::ALL_MATCHES);
 }
 
 void AutocompleteEditModel::StopAutocomplete() {
-  if (popup_->IsOpen() && update_instant_) {
+  if (popup_->IsOpen() && !in_revert_) {
     InstantController* instant = controller_->GetInstant();
     if (instant && !instant->commit_on_mouse_up())
       instant->DestroyPreviewContents();
   }
 
   autocomplete_controller_->Stop(true);
 }
 
 bool AutocompleteEditModel::CanPasteAndGo(const string16& text) const {
   if (!view_->GetCommandUpdater()->IsCommandEnabled(IDC_OPEN_CURRENT_URL))
@@ skipping 114 matching lines @@
     if (template_url) {
       UserMetrics::RecordAction(UserMetricsAction("AcceptedKeyword"));
       template_url_service->IncrementUsageCount(template_url);
     }
 
     // NOTE: We purposefully don't increment the usage count of the default
     // search engine, if applicable; see comments in template_url.h.
   }
 
   if (disposition != NEW_BACKGROUND_TAB) {
-    update_instant_ = false;
+    in_revert_ = true;
     view_->RevertAll();  // Revert the box to its unedited state
   }
 
   if (match.type == AutocompleteMatch::EXTENSION_APP) {
     LaunchAppFromOmnibox(match, profile_, disposition);
   } else {
     controller_->OnAutocompleteAccept(match.destination_url, disposition,
                                       match.transition, alternate_nav_url);
   }
 
   InstantController* instant = controller_->GetInstant();
   if (instant && !popup_->IsOpen())
     instant->DestroyPreviewContents();
-  update_instant_ = true;
+  in_revert_ = false;
 }
 
 bool AutocompleteEditModel::AcceptKeyword() {
   DCHECK(is_keyword_hint_ && !keyword_.empty());
 
   view_->OnBeforePossibleChange();
   view_->SetWindowTextAndCaretPos(string16(), 0);
   is_keyword_hint_ = false;
   view_->OnAfterPossibleChange();
   just_deleted_text_ = false;  // OnAfterPossibleChange() erroneously sets this
@@ skipping 451 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }