Experimental AutocompleteProvider for zerosuggest.

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/format_macros.h"
 #include "base/metrics/histogram.h"
@@ skipping 422 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 OmniboxEditModel::StopAutocomplete() {
-  if (popup_->IsOpen() && !in_revert_) {
-    InstantController* instant = controller_->GetInstant();
-    if (instant && !instant->commit_on_pointer_release())
-      instant->Hide();
+  if (popup_->IsOpen()) {
+    if (!in_revert_) {
+      InstantController* instant = controller_->GetInstant();
+      if (instant && !instant->commit_on_pointer_release())
+        instant->Hide();
+    }
+
+    autocomplete_controller_->Stop(true);
   }
-
-  autocomplete_controller_->Stop(true);
 }
 
 bool OmniboxEditModel::CanPasteAndGo(const string16& text) const {
   if (!view_->command_updater()->IsCommandEnabled(IDC_OPEN_CURRENT_URL))
     return false;
 
   AutocompleteMatch match;
   ClassifyStringForPasteAndGo(text, &match, NULL);
   return match.destination_url.is_valid();
 }
@@ skipping 64 matching lines @@
         autocomplete_controller_->input().text(),
         just_deleted_text_,
         autocomplete_controller_->input().type(),
         popup_->selected_line(),
         -1,  // don't yet know tab ID; set later if appropriate
         ClassifyPage(controller_->GetTabContents()->
                      web_contents()->GetURL()),
         base::TimeTicks::Now() - time_user_first_modified_omnibox_,
         0,  // inline autocomplete length; possibly set later
         result());
-    DCHECK(user_input_in_progress_) << "We didn't get here through the "
-        "expected series of calls.  time_user_first_modified_omnibox_ is "
-        "not set correctly and other things may be wrong.";
+    DCHECK(user_input_in_progress_ ||
+           (match.provider && match.provider->name() == "ZeroSuggest"))
+        << "We didn't get here through the expected series of calls. "
+        << "time_user_first_modified_omnibox_ is not set correctly and other "
+        << "things may be wrong.";
     if (index != OmniboxPopupModel::kNoMatch)
       log.selected_index = index;
     else if (!has_temporary_text_)
       log.inline_autocompleted_length = inline_autocomplete_text_.length();
     if (disposition == CURRENT_TAB) {
       // If we know the destination is being opened in the current tab,
       // we can easily get the tab ID.  (If it's being opened in a new
       // tab, we don't know the tab ID yet.)
       log.tab_id = controller_->GetTabContents()->
           restore_tab_helper()->session_id().id();
@@ skipping 141 matching lines @@
 }
 
 void OmniboxEditModel::OnSetFocus(bool control_down) {
   has_focus_ = true;
   control_key_state_ = control_down ? DOWN_WITHOUT_CHANGE : UP;
 
   InstantController* instant = controller_->GetInstant();
   if (instant)
     instant->OnAutocompleteGotFocus();
 
+  // TODO(jered): Merge this into Start() and just call that here rather than
+  // having a special entry point for zero-suggest.

[Peter Kasting, 2012/08/15 05:30:39]

Ah.  That's what you meant.

Hmm.  I wonder if we really want to call Start() here or if we'll still want to
preserve a distinction in the API.  Oh well, that probably is not perfectly
decidable yet, so this comment is fine.  Or maybe you could add "We may want to"
in front of the rest of the comment.

[Jered, 2012/08/15 16:32:12]

Done.

+  autocomplete_controller_->StartZeroSuggest(PermanentURL(), user_text_);
+
   NotifySearchTabHelper();
 }
 
 void OmniboxEditModel::OnWillKillFocus(gfx::NativeView view_gaining_focus) {
   SetSuggestedText(string16(), INSTANT_COMPLETE_NOW);
 
   if (InstantController* instant = controller_->GetInstant())
     instant->OnAutocompleteLostFocus(view_gaining_focus);
 
+  // TODO(jered): Rip this out along with StartZeroSuggest.
+  autocomplete_controller_->StopZeroSuggest();
   NotifySearchTabHelper();
 }
 
 void OmniboxEditModel::OnKillFocus() {
   has_focus_ = false;
   control_key_state_ = UP;
   paste_state_ = NONE;
 }
 
 bool OmniboxEditModel::OnEscapeKeyPressed() {
@@ skipping 488 matching lines @@
 }
 
 void OmniboxEditModel::ClassifyStringForPasteAndGo(
     const string16& text,
     AutocompleteMatch* match,
     GURL* alternate_nav_url) const {
   DCHECK(match);
   AutocompleteClassifierFactory::GetForProfile(profile_)->Classify(text,
       string16(), false, false, match, alternate_nav_url);
 }