Adds QueryParser::ExtractQueryWords. For consistent this should...

chrome/browser/history/query_parser.h

 // Copyright (c) 2006-2008 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.
 
 // The query parser is used to parse queries entered into the history
 // search into more normalized queries can be passed to the SQLite backend.
 
 #ifndef CHROME_BROWSER_HISTORY_QUERY_PARSER_H__
 #define CHROME_BROWSER_HISTORY_QUERY_PARSER_H__
 
@@ skipping 30 matching lines @@
   // Returns true if this node matches the specified text. If exact is true,
   // the string must exactly match. Otherwise, this uses a starts with
   // comparison.
   virtual bool Matches(const std::wstring& word, bool exact) const = 0;
 
   // Returns true if this node matches at least one of the words in words. If
   // the node matches at least one word, an entry is added to match_positions
   // giving the matching region.
   virtual bool HasMatchIn(const std::vector<QueryWord>& words,
                           Snippet::MatchPositions* match_positions) const = 0;
+
+  // Appends the words that make up this node in |words|.
+  virtual void AppendWords(std::vector<std::wstring>* words) const = 0;
 };
 
 
 class QueryParser {
  public:
   QueryParser();
 
   // Parse a query into a SQLite query. The resulting query is placed in
   // sqlite_query and the number of words is returned.
   int ParseQuery(const std::wstring& query,
                  std::wstring* sqlite_query);
 
   // Parses the query words in query, returning the nodes that constitute the
   // valid words in the query. This is intended for later usage with
   // DoesQueryMatch.
   // Ownership of the nodes passes to the caller.
   void ParseQuery(const std::wstring& query,
                   std::vector<QueryNode*>* nodes);
 
+  // Parses a query returning the words that make up the query. Any words in
+  // quotes are put in |words| without the quotes. For example, the query text
+  // "foo bar" results in two entries being added to words, one for foo and one
+  // for bar.
+  void ExtractQueryWords(const std::wstring& query,
+                         std::vector<std::wstring>* words);
+
   // Returns true if the string text matches the query nodes created by a call
   // to ParseQuery. If the query does match each of the matching positions in
   // the text is added to |match_positions|.
   bool DoesQueryMatch(const std::wstring& text,
                       const std::vector<QueryNode*>& nodes,
                       Snippet::MatchPositions* match_positions);
 
  private:
   // Does the work of parsing a query; creates nodes in QueryNodeList as
   // appropriate. This is invoked from both of the ParseQuery methods.
   bool ParseQueryImpl(const std::wstring& query,
                       QueryNodeList* root);
 
   // Extracts the words from text, placing each word into words.
   void ExtractQueryWords(const std::wstring& text,
                          std::vector<QueryWord>* words);
 };
 
 #endif  // CHROME_BROWSER_HISTORY_QUERY_PARSER_H__