InstantExtended: Remove overlay control code.

chrome/browser/ui/omnibox/omnibox_controller.cc

 // Copyright 2013 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_controller.h"
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/search_provider.h"
@@ skipping 49 matching lines @@
     string16 user_text,
     size_t cursor_position,
     const GURL& current_url,
     bool prevent_inline_autocomplete,
     bool prefer_keyword,
     bool allow_exact_keyword_match,
     int omnibox_start_margin) const {
   ClearPopupKeywordMode();
   popup_->SetHoveredLine(OmniboxPopupModel::kNoMatch);
 
-#if defined(HTML_INSTANT_EXTENDED_POPUP)
-  InstantController* instant_controller = GetInstantController();
-  if (instant_controller)
-    instant_controller->OnAutocompleteStart();
-#endif
   if (chrome::IsInstantExtendedAPIEnabled()) {
     autocomplete_controller_->search_provider()->
         SetOmniboxStartMargin(omnibox_start_margin);
   }
 
   // We don't explicitly clear OmniboxPopupModel::manually_selected_match, as
   // Start ends up invoking OmniboxPopupModel::OnResultChanged which clears it.
   autocomplete_controller_->Start(AutocompleteInput(
       user_text, cursor_position, string16(), current_url,
       prevent_inline_autocomplete, prefer_keyword, allow_exact_keyword_match,
@@ skipping 32 matching lines @@
     } else {
       InvalidateCurrentMatch();
       popup_->OnResultChanged();
       omnibox_edit_model_->OnPopupDataChanged(string16(), NULL, string16(),
                                               false);
     }
   } else {
     popup_->OnResultChanged();
   }
 
-  // TODO(beaudoin): This may no longer be needed now that instant classic is
-  // gone.
-  if (popup_->IsOpen()) {
-    // The popup size may have changed, let instant know.
-    OnPopupBoundsChanged(popup_->view()->GetTargetBounds());
-
-#if defined(HTML_INSTANT_EXTENDED_POPUP)
-    InstantController* instant_controller = GetInstantController();
-    if (instant_controller && !omnibox_edit_model_->in_revert()) {
-      instant_controller->HandleAutocompleteResults(
-          *autocomplete_controller_->providers(),
-          autocomplete_controller_->result());
-    }
-#endif
-  } else if (was_open) {
+  if (!popup_->IsOpen() && was_open) {
     // Accept the temporary text as the user text, because it makes little sense
     // to have temporary text when the popup is closed.
     omnibox_edit_model_->AcceptTemporaryTextAsUserText();
-    // The popup has been closed, let instant know.
-    OnPopupBoundsChanged(gfx::Rect());
   }
 }
 
 bool OmniboxController::DoInstant(const AutocompleteMatch& match,
                                   string16 user_text,
                                   string16 full_text,
                                   size_t selection_start,
                                   size_t selection_end,
                                   bool user_input_in_progress,
                                   bool in_escape_handler,
                                   bool just_deleted_text,
                                   bool keyword_is_selected) {
-#if defined(HTML_INSTANT_EXTENDED_POPUP)
-  InstantController* instant_controller = GetInstantController();
-  if (!instant_controller)
-    return false;
-
-  // Remove "?" if we're in forced query mode.
-  AutocompleteInput::RemoveForcedQueryStringIfNecessary(
-      autocomplete_controller_->input().type(), &user_text);
-  AutocompleteInput::RemoveForcedQueryStringIfNecessary(
-      autocomplete_controller_->input().type(), &full_text);
-  return instant_controller->Update(
-      match, user_text, full_text, selection_start, selection_end,
-      UseVerbatimInstant(just_deleted_text), user_input_in_progress,
-      popup_->IsOpen(), in_escape_handler, keyword_is_selected);
-#else
   return false;

[Peter Kasting, 2013/06/28 18:47:55]

Should there be a TODO to nuke this function too?

[Jered, 2013/06/28 19:09:55]

Just did it.

-#endif
 }
 
 void OmniboxController::SetInstantSuggestion(
     const InstantSuggestion& suggestion) {
-// Should only get called for the HTML popup.
-#if defined(HTML_INSTANT_EXTENDED_POPUP)
-  switch (suggestion.behavior) {
-    case INSTANT_COMPLETE_NOW:
-      // Set blue suggestion text.
-      // TODO(beaudoin): Create a valid current_match_ and call
-      // omnibox_edit_model_->OnCurrentMatchChanged.
-      return;
-
-    case INSTANT_COMPLETE_NEVER: {
-      DCHECK_EQ(INSTANT_SUGGESTION_SEARCH, suggestion.type);
-
-      // Set gray suggestion text.
-      // Remove "?" if we're in forced query mode.
-      gray_suggestion_ = suggestion.text;
-
-      omnibox_edit_model_->OnGrayTextChanged();
-      return;
-    }
-
-    case INSTANT_COMPLETE_REPLACE:
-      // Replace the entire omnibox text by the suggestion the user just arrowed
-      // to.
-      CreateAndSetInstantMatch(suggestion.text, suggestion.text,
-                               suggestion.type == INSTANT_SUGGESTION_SEARCH ?
-                                   AutocompleteMatchType::SEARCH_SUGGEST :
-                                   AutocompleteMatchType::URL_WHAT_YOU_TYPED);
-
-      omnibox_edit_model_->OnCurrentMatchChanged(true);
-      return;
-  }
-#endif
+  // TODO(jered): Delete this.
 }
 
 void OmniboxController::InvalidateCurrentMatch() {
   current_match_ = AutocompleteMatch();
 }
 
 void OmniboxController::ClearPopupKeywordMode() const {
   if (popup_->IsOpen() &&
       popup_->selected_line_state() == OmniboxPopupModel::KEYWORD)
     popup_->SetSelectedLineState(OmniboxPopupModel::NORMAL);
 }
 
 void OmniboxController::DoPreconnect(const AutocompleteMatch& match) {
   if (!match.destination_url.SchemeIs(extensions::kExtensionScheme)) {
     // Warm up DNS Prefetch cache, or preconnect to a search service.
     UMA_HISTOGRAM_ENUMERATION("Autocomplete.MatchType", match.type,
                               AutocompleteMatchType::NUM_TYPES);
     if (profile_->GetNetworkPredictor()) {
       profile_->GetNetworkPredictor()->AnticipateOmniboxUrl(
           match.destination_url,
           AutocompleteActionPredictor::IsPreconnectable(match));
     }
     // We could prefetch the alternate nav URL, if any, but because there
     // can be many of these as a user types an initial series of characters,
     // the OS DNS cache could suffer eviction problems for minimal gain.
   }
 }
 
-void OmniboxController::OnPopupBoundsChanged(const gfx::Rect& bounds) {
-  InstantController* instant_controller = GetInstantController();
-  if (instant_controller)
-    instant_controller->SetPopupBounds(bounds);
-}
-
 bool OmniboxController::UseVerbatimInstant(bool just_deleted_text) const {
 #if defined(OS_MACOSX)
   // TODO(suzhe): Fix Mac port to display Instant suggest in a separated NSView,
   // so that we can display Instant suggest along with composition text.
   const AutocompleteInput& input = autocomplete_controller_->input();
   if (input.prevent_inline_autocomplete())
     return true;
 #endif
 
   // The value of input.prevent_inline_autocomplete() is determined by the
@@ skipping 16 matching lines @@
     string16 input_text,
     AutocompleteMatchType::Type match_type) {
   string16 keyword = GetDefaultSearchProviderKeyword(profile_);
   if (keyword.empty())
     return;  // CreateSearchSuggestion needs a keyword.
 
   current_match_ = SearchProvider::CreateSearchSuggestion(
       profile_, NULL, AutocompleteInput(), query_string, input_text, 0,
       match_type, 0, false, keyword, -1);
 }