Omnibox: Add Mid-Input Matching to HistoryQuick Provider

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>
 #include <numeric>
+#include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/api/bookmarks/bookmark_service.h"
@@ skipping 49 matching lines @@
 URLIndexPrivateData::URLIndexPrivateData()
     : restored_cache_version_(0),
       saved_cache_version_(kCurrentCacheFileVersion),
       pre_filter_item_count_(0),
       post_filter_item_count_(0),
       post_scoring_item_count_(0) {
 }
 
 ScoredHistoryMatches URLIndexPrivateData::HistoryItemsForTerms(
     const string16& search_string,
+    size_t cursor_position,
     BookmarkService* bookmark_service) {
+  // If cursor position is set and useful (not at either end of the string),
+  // allow the search string to be broken at cursor position.  We do this
+  // by pretending there's a space where the cursor is.
+  // TODO(figure out highlighting).
+  const string16& search_string_with_cursor =
+      ((cursor_position != string16::npos) &&
+       (cursor_position < search_string.length()) &&
+       (cursor_position > 0)) ?
+      search_string.substr(0, cursor_position) + kWhitespaceUTF16 +

[Peter Kasting, 2013/01/04 23:47:39]

This doesn't insert a space, it inserts a whole string of whitespace characters.

I think you want ASCIIToUTF16(" ").

This could be done most simply by passing |search_string| by value and then
doing:

  if (...)
    search_string.insert(cursor_position, ASCIIToUTF16(" ");
  ...

[Mark P, 2013/01/09 19:51:53]

Done.

+      search_string.substr(cursor_position) : search_string;
   pre_filter_item_count_ = 0;
   post_filter_item_count_ = 0;
   post_scoring_item_count_ = 0;
   // The search string we receive may contain escaped characters. For reducing
   // the index we need individual, lower-cased words, ignoring escapings. For
   // the final filtering we need whitespace separated substrings possibly
   // containing escaped characters.
-  string16 lower_raw_string(base::i18n::ToLower(search_string));
+  string16 lower_raw_string(base::i18n::ToLower(search_string_with_cursor));
   string16 lower_unescaped_string =
       net::UnescapeURLComponent(lower_raw_string,
           net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS);
   // Extract individual 'words' (as opposed to 'terms'; see below) from the
   // search string. When the user types "colspec=ID%20Mstone Release" we get
   // four 'words': "colspec", "id", "mstone" and "release".
   String16Vector lower_words(
       history::String16VectorFromString16(lower_unescaped_string, false, NULL));
   ScoredHistoryMatches scored_items;
 
@@ skipping 1053 matching lines @@
 }
 
 // static
 bool URLIndexPrivateData::URLSchemeIsWhitelisted(
     const GURL& gurl,
     const std::set<std::string>& whitelist) {
   return whitelist.find(gurl.scheme()) != whitelist.end();
 }
 
 }  // namespace history