Fix keyword recognition.

chrome/browser/history/url_index_private_data.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/history/url_index_private_data.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 #include <limits>
@@ skipping 512 matching lines @@
     match.title_matches.insert(match.title_matches.end(),
                                title_term_matches.begin(),
                                title_term_matches.end());
   }
 
   // Sort matches by offset and eliminate any which overlap.
   match.url_matches = SortAndDeoverlapMatches(match.url_matches);
   match.title_matches = SortAndDeoverlapMatches(match.title_matches);
 
   // We can inline autocomplete a result if:
-  //  1) the search term starts at the beginning of the candidate URL, OR
-  //  2) the candidate URL has one of the standard 'ftp' or 'http[s]'
-  //     prefixes.
-  match.can_inline = match.url_matches.size() &&
+  //  1) there is only one search term
+  //  2) AND EITHER:
+  //    2a) the first match starts at the beginning of the candidate URL, OR
+  //    2b) the candidate URL starts with one of the standard URL prefixes with
+  //        the URL match immediately following that prefix.
+  //  4) AND the search string does not end in whitespace (making it look to

[Peter Kasting, 2012/01/26 23:04:30]

Nit: 4 -> 3

[mrossetti, 2012/01/26 23:09:37]

Done.

+  //     the IMUI as though there is a single search term when actually there
+  //     is a second, empty term).
+  match.can_inline = match.url_matches.size() > 0 &&

[Peter Kasting, 2012/01/26 23:04:30]

Nit: !empty()

[mrossetti, 2012/01/26 23:09:37]

Done.

+      terms.size() == 1 &&
       (match.url_matches[0].offset == 0 ||
-       IsInlineablePrefix(url.substr(0, match.url_matches[0].offset)));
+       IsInlineablePrefix(url.substr(0, match.url_matches[0].offset))) &&
+      !IsWhitespace(*(lower_string.rbegin()));
 
   // Get partial scores based on term matching. Note that the score for
   // each of the URL and title are adjusted by the fraction of the
   // terms appearing in each.
   int url_score = ScoreComponentForMatches(match.url_matches, url.length()) *
       std::min(match.url_matches.size(), terms.size()) / terms.size();
   int title_score =
       ScoreComponentForMatches(match.title_matches, title.length()) *
       std::min(match.title_matches.size(), terms.size()) / terms.size();
   // Arbitrarily pick the best.
@@ skipping 585 matching lines @@
     if (iter->has_title()) {
       string16 title(UTF8ToUTF16(iter->title()));
       url_row.set_title(title);
     }
     history_info_map_[history_id] = url_row;
   }
   return true;
 }
 
 }  // namespace history