Omnibox: Make URLs of Bookmarks Searchable

chrome/browser/autocomplete/bookmark_provider.h

 // 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.
 
 #ifndef CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_
 #define CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_
 
 #include <string>
 
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/history/snippet.h"
 
 class BookmarkModel;
-struct BookmarkTitleMatch;
+struct BookmarkMatch;
 class Profile;
 
 // This class is an autocomplete provider which quickly (and synchronously)
 // provides autocomplete suggestions based on the titles of bookmarks. Page
 // titles, URLs, and typed and visit counts of the bookmarks are not currently
 // taken into consideration as those factors will have been used by the
 // HistoryQuickProvider (HQP) while identifying suggestions.
 //
 // TODO(mrossetti): Propose a way to coordinate with the HQP the taking of typed
 // and visit counts and last visit dates, etc. into consideration while scoring.
@@ skipping 15 matching lines @@
  private:
   FRIEND_TEST_ALL_PREFIXES(BookmarkProviderTest, InlineAutocompletion);
 
   virtual ~BookmarkProvider();
 
   // Performs the actual matching of |input| over the bookmarks and fills in
   // |matches_|. If |best_match| then only suggest the single best match,
   // otherwise suggest the top |kMaxMatches| matches.
   void DoAutocomplete(const AutocompleteInput& input, bool best_match);
 
-  // Compose an AutocompleteMatch based on |title_match| that has 1) the URL of
+  // Compose an AutocompleteMatch based on |match| that has 1) the URL of
   // title_match's bookmark, and 2) the bookmark's title, not the URL's page

[Peter Kasting, 2014/04/16 23:44:25]

Nit: This still refers to |title_match|

[Mark P, 2014/04/17 20:24:18]

Done.

   // title, as the description.  |input| is used to compute the match's
   // inline_autocompletion.  |fixed_up_input| is used in that way as well;
   // it's passed separately so this function doesn't have to compute it.
-  AutocompleteMatch TitleMatchToACMatch(
+  // title, as the description.

[Peter Kasting, 2014/04/16 23:44:25]

Nit: Uh... broken edit?

[Mark P, 2014/04/17 20:24:18]

Yup, bad rebase/resolve.
Fixed.

+  AutocompleteMatch BookmarkMatchToACMatch(
       const AutocompleteInput& input,
       const AutocompleteInput& fixed_up_input,
-      const BookmarkTitleMatch& title_match);
+      const BookmarkMatch& match);
 
   // Converts |positions| into ACMatchClassifications and returns the
   // classifications. |text_length| is used to determine the need to add an
   // 'unhighlighted' classification span so the tail of the source string
   // properly highlighted.
   static ACMatchClassifications ClassificationsFromMatch(
       const Snippet::MatchPositions& positions,
-      size_t text_length);
+      size_t text_length,
+      bool is_url);
 
   BookmarkModel* bookmark_model_;
 
+  // True if we should use matches in the URL for scoring.
+  const bool score_using_url_matches_;
+
   // Languages used during the URL formatting.
   std::string languages_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkProvider);
 };
 
 #endif  // CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_