Remove unused / unnecessary stuff from Instant.

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 177 matching lines @@
     // There may be no providers during testing; guard against that.
     if (search_provider)
       search_provider->FinalizeInstantQuery(input_text, suggestion);
   }
 }
 
 void OmniboxEditModel::SetInstantSuggestion(
     const InstantSuggestion& suggestion) {
   switch (suggestion.behavior) {
     case INSTANT_COMPLETE_NOW:
-      view_->SetInstantSuggestion(string16(), false);
+      view_->SetInstantSuggestion(string16());
       if (!suggestion.text.empty())
         FinalizeInstantQuery(view_->GetText(), suggestion, false);
       break;
 
-    case INSTANT_COMPLETE_DELAYED:
-      DCHECK_EQ(INSTANT_SUGGESTION_SEARCH, suggestion.type);
-      // Starts out as gray text (i.e., INSTANT_COMPLETE_NEVER) and animates to
-      // completed blue text by way of CommitSuggestedText().
-      view_->SetInstantSuggestion(suggestion.text, true);
-      break;
-
     case INSTANT_COMPLETE_NEVER:
       DCHECK_EQ(INSTANT_SUGGESTION_SEARCH, suggestion.type);
-      view_->SetInstantSuggestion(suggestion.text, false);
+      view_->SetInstantSuggestion(suggestion.text);
       break;
 
     case INSTANT_COMPLETE_REPLACE:
-      view_->SetInstantSuggestion(string16(), false);
+      view_->SetInstantSuggestion(string16());
       has_temporary_text_ = true;
       is_temporary_text_set_by_instant_ = true;
       view_->SetWindowTextAndCaretPos(suggestion.text, suggestion.text.size(),
                                       false, false);
       break;
   }
 }
 
 bool OmniboxEditModel::CommitSuggestedText(bool skip_inline_autocomplete) {
   if (!controller_->GetInstant())
     return false;
 
   const string16 suggestion = view_->GetInstantSuggestion();
   if (suggestion.empty())
     return false;
 
-  // Assume delayed commits are always search suggestions.
+  // Assume that the gray text we are committing is a search suggestion.
   FinalizeInstantQuery(view_->GetText(),
                        InstantSuggestion(suggestion,
                                          INSTANT_COMPLETE_NOW,
                                          INSTANT_SUGGESTION_SEARCH),
                        skip_inline_autocomplete);
   return true;
 }
 
 bool OmniboxEditModel::AcceptCurrentInstantPreview() {
   InstantController* instant = controller_->GetInstant();
@@ skipping 41 matching lines @@
         DoPreconnect(current_match);
         break;
       case AutocompleteActionPredictor::ACTION_NONE:
         break;
       default:
         NOTREACHED() << "Unexpected recommended action: " << recommended_action;
         break;
     }
 
     // Hide any suggestions we might be showing.
-    view_->SetInstantSuggestion(string16(), false);
+    view_->SetInstantSuggestion(string16());
 
     // No need to wait any longer for instant.
     FinalizeInstantQuery(string16(), InstantSuggestion(), false);
   }
 
   controller_->OnChanged();
 }
 
 void OmniboxEditModel::GetDataForURLExport(GURL* url,
                                            string16* title,
@@ skipping 992 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);
 }