Omnibox: Make Exact Match Tab-to-Search Work

chrome/browser/autocomplete/autocomplete_controller.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/autocomplete/autocomplete_controller.h"
 
 #include <set>
 #include <string>
 
 #include "base/format_macros.h"
@@ skipping 486 matching lines @@
     last_time_default_match_changed_ = base::TimeTicks::Now();
 
   NotifyChanged(force_notify_default_match_changed || notify_default_match);
 }
 
 void AutocompleteController::UpdateAssociatedKeywords(
     AutocompleteResult* result) {
   if (!keyword_provider_)
     return;
 
+  // Determine if the user's input is an exact keyword match.
+  base::string16 exact_keyword = keyword_provider_->GetKeywordForText(
+      TemplateURLService::CleanUserInputKeyword(input_.text()));
+
   std::set<base::string16> keywords;
   for (ACMatches::iterator match(result->begin()); match != result->end();
        ++match) {
     base::string16 keyword(
         match->GetSubstitutingExplicitlyInvokedKeyword(template_url_service_));
     if (!keyword.empty()) {
       keywords.insert(keyword);
       continue;
     }
 
+    // When the user has typed an exact keyword, we want tab-to-search on the
+    // default match to select that keyword, even if the match
+    // inline-autocompletes to a different keyword.  (This prevents inline
+    // autocompletions from blocking a user's attempts to use an explicitly-set
+    // keyword of their own creation.)  So use |exact_keyword| if it's
+    // available.
+    if (!exact_keyword.empty() && !keywords.count(exact_keyword)) {
+      keywords.insert(exact_keyword);
+      match->associated_keyword.reset(new AutocompleteMatch(
+          keyword_provider_->CreateVerbatimMatch(exact_keyword,
+                                                 exact_keyword, input_)));
+      continue;
+    }
+
+    // Otherwise use the particular match's associated keyword.

[Peter Kasting, 2014/08/04 22:53:11]

Nit: This comment is now somewhat misleading as you don't actually pay attention
to any associated keyword.  How about:

Otherwise, set a match's associated keyword based on the match's fill_into_edit,
which should take inline autocompletions into account.

[Mark P, 2014/08/04 22:58:24]

Done.  I see why it's better.  Thank you for rewriting comments for me. :-)

+    keyword = keyword_provider_->GetKeywordForText(match->fill_into_edit);
+
     // Only add the keyword if the match does not have a duplicate keyword with
     // a more relevant match.
-    keyword = match->associated_keyword.get() ?
-        match->associated_keyword->keyword :
-        keyword_provider_->GetKeywordForText(match->fill_into_edit);
     if (!keyword.empty() && !keywords.count(keyword)) {
       keywords.insert(keyword);
-
-      if (!match->associated_keyword.get())
-        match->associated_keyword.reset(new AutocompleteMatch(
-            keyword_provider_->CreateVerbatimMatch(match->fill_into_edit,
-                                                   keyword, input_)));
+      match->associated_keyword.reset(new AutocompleteMatch(
+          keyword_provider_->CreateVerbatimMatch(match->fill_into_edit,
+                                                 keyword, input_)));
     } else {
       match->associated_keyword.reset();
     }
   }
 }
 
 void AutocompleteController::UpdateKeywordDescriptions(
     AutocompleteResult* result) {
   base::string16 last_keyword;
   for (AutocompleteResult::iterator i(result->begin()); i != result->end();
@@ skipping 111 matching lines @@
                         this, &AutocompleteController::ExpireCopiedEntries);
 }
 
 void AutocompleteController::StartStopTimer() {
   stop_timer_.Start(FROM_HERE,
                     stop_timer_duration_,
                     base::Bind(&AutocompleteController::Stop,
                                base::Unretained(this),
                                false));
 }