Allow systematic prefix search in bookmarks.

components/bookmarks/browser/bookmark_index.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_INDEX_H_
 #define COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_INDEX_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 23 matching lines @@
   BookmarkIndex(BookmarkClient* client,
                 const std::string& languages);
   ~BookmarkIndex();
 
   // Invoked when a bookmark has been added to the model.
   void Add(const BookmarkNode* node);
 
   // Invoked when a bookmark has been removed from the model.
   void Remove(const BookmarkNode* node);
 
-  // Returns up to |max_count| of bookmarks containing each term from
-  // the text |query| in either the title or the URL.
-  void GetBookmarksMatching(
-      const base::string16& query,
-      size_t max_count,
-      std::vector<BookmarkMatch>* results);
+  // Returns up to |max_count| of bookmarks containing each term from the text
+  // |query| in either the title or the URL.
+  // |always_prefix_search| is passed to |GetBookmarksMatchingTerm| internally.
+  void GetBookmarksMatching(const base::string16& query,
+                            size_t max_count,
+                            bool always_prefix_search,
+                            std::vector<BookmarkMatch>* results);
 
  private:
   typedef std::vector<const BookmarkNode*> Nodes;
   typedef std::set<const BookmarkNode*> NodeSet;
   typedef std::map<base::string16, NodeSet> Index;
 
   struct Match;
   typedef std::vector<Match> Matches;
 
   // Extracts |matches.nodes| into Nodes, sorts the pairs in decreasing order of
   // typed count (if supported by the client), and then de-dupes the matches.
   void SortMatches(const Matches& matches, Nodes* sorted_nodes) const;
 
   // Add |node| to |results| if the node matches the query.
   void AddMatchToResults(
       const BookmarkNode* node,
       query_parser::QueryParser* parser,
       const query_parser::QueryNodeStarVector& query_nodes,
       std::vector<BookmarkMatch>* results);
 
   // Populates |matches| for the specified term. If |first_term| is true, this
   // is the first term in the query. Returns true if there is at least one node
   // matching the term.
+  // When |always_prefix_search| is false, if the term is not long enough in the

[sky, 2014/11/03 21:44:05]

This description is confusing. I think you want something like:
When |always_prefix_search| is true, the term is always considered for a prefix
search. If false, the behavior of exact match depends on
|query_parser::QueryParser::IsWordLongEnoughForPrefixSearch|. If the term is
long enough for a prefix search a prefix search is done, otherwise an exact
match is done.

[Kibeom Kim (inactive), 2014/11/04 01:28:19]

Done. (removed since we put enum and it's self-explanatory)

+  // sense of |query_parser::QueryParser::IsWordLongEnoughForPrefixSearch|, it
+  // is not considered for prefix search but only for an exact match.
+  // When |always_prefix_search| is true, the term is always considered for a
+  // prefix search, no matter its length.
   bool GetBookmarksMatchingTerm(const base::string16& term,
                                 bool first_term,
+                                bool always_prefix_search,
                                 Matches* matches);
 
   // Iterates over |matches| updating each Match's nodes to contain the
   // intersection of the Match's current nodes and the nodes at |index_i|.
   // If the intersection is empty, the Match is removed.
   //
   // This is invoked from GetBookmarksMatchingTerm.
   void CombineMatchesInPlace(const Index::const_iterator& index_i,
                              Matches* matches);
 
@@ skipping 25 matching lines @@
 
   // Languages used to help parse IDNs in URLs for the bookmark index.
   const std::string languages_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkIndex);
 };
 
 }  // namespace bookmarks
 
 #endif  // COMPONENTS_BOOKMARKS_BROWSER_BOOKMARK_INDEX_H_