Omnibox: Make URLs of Bookmarks Searchable

components/bookmarks/browser/bookmark_index.cc

 // 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.
 
 #include "components/bookmarks/browser/bookmark_index.h"
 
 #include <algorithm>
 #include <functional>
 #include <iterator>
 #include <list>
@@ skipping 79 matching lines @@
 BookmarkIndex::NodeSet::const_iterator
     BookmarkIndex::Match::nodes_begin() const {
   return nodes.empty() ? terms.front()->second.begin() : nodes.begin();
 }
 
 BookmarkIndex::NodeSet::const_iterator BookmarkIndex::Match::nodes_end() const {
   return nodes.empty() ? terms.front()->second.end() : nodes.end();
 }
 
 BookmarkIndex::BookmarkIndex(BookmarkClient* client,
-                             bool index_urls,
                              const std::string& languages)
     : client_(client),
-      languages_(languages),
-      index_urls_(index_urls) {
+      languages_(languages) {
   DCHECK(client_);
 }
 
 BookmarkIndex::~BookmarkIndex() {
 }
 
 void BookmarkIndex::Add(const BookmarkNode* node) {
   if (!node->is_url())
     return;
   std::vector<base::string16> terms =
       ExtractQueryWords(Normalize(node->GetTitle()));
   for (size_t i = 0; i < terms.size(); ++i)
     RegisterNode(terms[i], node);
-  if (index_urls_) {
-    terms =
-        ExtractQueryWords(CleanUpUrlForMatching(node->url(), languages_, NULL));
-    for (size_t i = 0; i < terms.size(); ++i)
-      RegisterNode(terms[i], node);
-  }
+  terms =
+      ExtractQueryWords(CleanUpUrlForMatching(node->url(), languages_, NULL));
+  for (size_t i = 0; i < terms.size(); ++i)
+    RegisterNode(terms[i], node);
 }
 
 void BookmarkIndex::Remove(const BookmarkNode* node) {
   if (!node->is_url())
     return;
 
   std::vector<base::string16> terms =
       ExtractQueryWords(Normalize(node->GetTitle()));
   for (size_t i = 0; i < terms.size(); ++i)
     UnregisterNode(terms[i], node);
-  if (index_urls_) {
-    terms =
-        ExtractQueryWords(CleanUpUrlForMatching(node->url(), languages_, NULL));
-    for (size_t i = 0; i < terms.size(); ++i)
-      UnregisterNode(terms[i], node);
-  }
+  terms =
+      ExtractQueryWords(CleanUpUrlForMatching(node->url(), languages_, NULL));
+  for (size_t i = 0; i < terms.size(); ++i)
+    UnregisterNode(terms[i], node);
 }
 
 void BookmarkIndex::GetBookmarksMatching(const base::string16& input_query,
                                          size_t max_count,
                                          std::vector<BookmarkMatch>* results) {
   const base::string16 query = Normalize(input_query);
   std::vector<base::string16> terms = ExtractQueryWords(query);
   if (terms.empty())
     return;
 
@@ skipping 61 matching lines @@
   // Check that the result matches the query.  The previous search
   // was a simple per-word search, while the more complex matching
   // of QueryParser may filter it out.  For example, the query
   // ["thi"] will match the bookmark titled [Thinking], but since
   // ["thi"] is quoted we don't want to do a prefix match.
   query_parser::QueryWordVector title_words, url_words;
   const base::string16 lower_title =
       base::i18n::ToLower(Normalize(node->GetTitle()));
   parser->ExtractQueryWords(lower_title, &title_words);
   base::OffsetAdjuster::Adjustments adjustments;
-  if (index_urls_) {
-    parser->ExtractQueryWords(
-        CleanUpUrlForMatching(node->url(), languages_, &adjustments),
-        &url_words);
-  }
+  parser->ExtractQueryWords(
+      CleanUpUrlForMatching(node->url(), languages_, &adjustments),
+      &url_words);
   query_parser::Snippet::MatchPositions title_matches, url_matches;
   for (size_t i = 0; i < query_nodes.size(); ++i) {
     const bool has_title_matches =
         query_nodes[i]->HasMatchIn(title_words, &title_matches);
-    const bool has_url_matches = index_urls_ &&
+    const bool has_url_matches =
         query_nodes[i]->HasMatchIn(url_words, &url_matches);
     if (!has_title_matches && !has_url_matches)
       return;
     query_parser::QueryParser::SortAndCoalesceMatchPositions(&title_matches);
-    if (index_urls_)
-      query_parser::QueryParser::SortAndCoalesceMatchPositions(&url_matches);
+    query_parser::QueryParser::SortAndCoalesceMatchPositions(&url_matches);
   }
   BookmarkMatch match;
   if (lower_title.length() == node->GetTitle().length()) {
     // Only use title matches if the lowercase string is the same length
     // as the original string, otherwise the matches are meaningless.
     // TODO(mpearson): revise match positions appropriately.
     match.title_match_positions.swap(title_matches);
   }
-  if (index_urls_) {
-    // Now that we're done processing this entry, correct the offsets of the
-    // matches in |url_matches| so they point to offsets in the original URL
-    // spec, not the cleaned-up URL string that we used for matching.
-    std::vector<size_t> offsets =
-        BookmarkMatch::OffsetsFromMatchPositions(url_matches);
-    base::OffsetAdjuster::UnadjustOffsets(adjustments, &offsets);
-    url_matches =
-        BookmarkMatch::ReplaceOffsetsInMatchPositions(url_matches, offsets);
-    match.url_match_positions.swap(url_matches);
-  }
+  // Now that we're done processing this entry, correct the offsets of the
+  // matches in |url_matches| so they point to offsets in the original URL
+  // spec, not the cleaned-up URL string that we used for matching.
+  std::vector<size_t> offsets =
+      BookmarkMatch::OffsetsFromMatchPositions(url_matches);
+  base::OffsetAdjuster::UnadjustOffsets(adjustments, &offsets);
+  url_matches =
+      BookmarkMatch::ReplaceOffsetsInMatchPositions(url_matches, offsets);
+  match.url_match_positions.swap(url_matches);
   match.node = node;
   results->push_back(match);
 }
 
 bool BookmarkIndex::GetBookmarksMatchingTerm(const base::string16& term,
                                                       bool first_term,
                                                       Matches* matches) {
   Index::const_iterator i = index_.lower_bound(term);
   if (i == index_.end())
     return false;
@@ skipping 95 matching lines @@
     // We can get here if the node has the same term more than once. For
     // example, a bookmark with the title 'foo foo' would end up here.
     return;
   }
   i->second.erase(node);
   if (i->second.empty())
     index_.erase(i);
 }
 
 }  // namespace bookmarks