Omnibox: BookmarksProvider: Make Multiple Prefix Matches Work

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 35 matching lines @@
   void GetBookmarksMatching(const base::string16& query,
                             size_t max_count,
                             query_parser::MatchingAlgorithm matching_algorithm,
                             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;
+  // Constructs |sorted_nodes| by taking the matches in |matches| and sorting
+  // them in decreasing order of typed count (if supported by the client) and
+  // deduping.
+  void SortMatches(const NodeSet& 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.
   bool GetBookmarksMatchingTerm(
       const base::string16& term,
       bool first_term,
       query_parser::MatchingAlgorithm matching_algorithm,
-      Matches* matches);
+      NodeSet* 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);
-
-  // Iterates over |current_matches| calculating the intersection between the
-  // Match's nodes and the nodes at |index_i|. If the intersection between the
-  // two is non-empty, a new match is added to |result|.
-  //
-  // This differs from CombineMatchesInPlace in that if the intersection is
-  // non-empty the result is added to result, not combined in place. This
-  // variant is used for prefix matching.
-  //
-  // This is invoked from GetBookmarksMatchingTerm.
-  void CombineMatches(const Index::const_iterator& index_i,
-                      const Matches& current_matches,
-                      Matches* result);
+  // Replaces |*matches| with the intersection of |*matches| and
+  // |matches_to_incorporate|.
+  void CombineMatchesInPlace(const NodeSet& matches_to_incorporate,
+                             NodeSet* matches);
 
   // Returns the set of query words from |query|.
   std::vector<base::string16> ExtractQueryWords(const base::string16& query);
 
   // Adds |node| to |index_|.
   void RegisterNode(const base::string16& term, const BookmarkNode* node);
 
   // Removes |node| from |index_|.
   void UnregisterNode(const base::string16& term, const BookmarkNode* node);
 
   Index index_;
 
   BookmarkClient* const client_;
 
   // 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_