Wires up ability for page to specify instant auto complete

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/metrics/histogram.h"
@@ skipping 61 matching lines @@
       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),
       paste_and_go_transition_(PageTransition::TYPED),
       profile_(profile),
-      update_instant_(true) {
+      update_instant_(true),
+      instant_complete_behavior_(INSTANT_COMPLETE_DELAYED) {
 }
 
 AutocompleteEditModel::~AutocompleteEditModel() {
 }
 
 void AutocompleteEditModel::SetProfile(Profile* profile) {
   DCHECK(profile);
   profile_ = profile;
   autocomplete_controller_->SetProfile(profile);
   popup_->set_profile(profile);
@@ skipping 72 matching lines @@
     view_->OnBeforePossibleChange();
     view_->SetWindowTextAndCaretPos(final_text, final_text.length());
     view_->OnAfterPossibleChange();
   } else if (popup_->IsOpen()) {
     SearchProvider* search_provider =
         autocomplete_controller_->search_provider();
     search_provider->FinalizeInstantQuery(input_text, suggest_text);
   }
 }
 
-void AutocompleteEditModel::SetSuggestedText(const string16& text) {
-  // This method is internally invoked to reset suggest text, so we only do
-  // anything if the text isn't empty.
-  // TODO: if we keep autocomplete, make it so this isn't invoked with empty
-  // text.
-  if (!text.empty())
-    FinalizeInstantQuery(view_->GetText(), text, false);
+void AutocompleteEditModel::SetSuggestedText(
+    const string16& text,
+    InstantCompleteBehavior behavior) {
+  instant_complete_behavior_ = behavior;
+  if (instant_complete_behavior_ == INSTANT_COMPLETE_NOW) {
+    if (!text.empty())
+      FinalizeInstantQuery(view_->GetText(), text, false);
+    else
+      view_->SetInstantSuggestion(text, false);
+  } else {
+    DCHECK((behavior == INSTANT_COMPLETE_DELAYED) ||
+           (behavior == INSTANT_COMPLETE_NEVER));
+    view_->SetInstantSuggestion(text, behavior == INSTANT_COMPLETE_DELAYED);
+  }
 }
 
 bool AutocompleteEditModel::CommitSuggestedText(bool skip_inline_autocomplete) {
   if (!controller_->GetInstant())
     return false;
 
   const string16 suggestion = view_->GetInstantSuggestion();
   if (suggestion.empty())
     return false;
 
   FinalizeInstantQuery(view_->GetText(), suggestion, skip_inline_autocomplete);
   return true;
 }
 
 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();
       } else {
         instant->Update(tab, CurrentMatch(), view_->GetText(),
                         UseVerbatimInstant(), &suggested_text);
       }
     } else {
       instant->DestroyPreviewContents();
     }
-    if (!instant->MightSupportInstant())
-      FinalizeInstantQuery(string16(), string16(), false);
+    might_support_instant = instant->MightSupportInstant();
   }
 
-  SetSuggestedText(suggested_text);
+  if (!might_support_instant) {

[Peter Kasting, 2011/03/29 00:10:27]

Nit: I'd remove the "!" and reverse the conditions

+    // 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_);
+  }
 
   controller_->OnChanged();
 }
 
 void AutocompleteEditModel::GetDataForURLExport(GURL* url,
                                                 string16* title,
                                                 SkBitmap* favicon) {
   AutocompleteMatch match;
   GetInfoForCurrentText(&match, NULL);
   *url = match.destination_url;
@@ skipping 327 matching lines @@
   has_focus_ = true;
   control_key_state_ = control_down ? DOWN_WITHOUT_CHANGE : UP;
   NotificationService::current()->Notify(
       NotificationType::AUTOCOMPLETE_EDIT_FOCUSED,
       Source<AutocompleteEditModel>(this),
       NotificationService::NoDetails());
 }
 
 void AutocompleteEditModel::OnWillKillFocus(
     gfx::NativeView view_gaining_focus) {
-  SetSuggestedText(string16());
+  SetSuggestedText(string16(), INSTANT_COMPLETE_NOW);
 
   InstantController* instant = controller_->GetInstant();
   if (instant)
     instant->OnAutocompleteLostFocus(view_gaining_focus);
 }
 
 void AutocompleteEditModel::OnKillFocus() {
   has_focus_ = false;
   control_key_state_ = UP;
   paste_state_ = NONE;
@@ skipping 360 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }