Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(227)

Side by Side Diff: chrome/browser/autocomplete/bookmark_provider.h

Issue 184663002: Omnibox: Make URLs of Bookmarks Searchable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix ALL_MATCHES (in response to recent changes) Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/autocomplete/bookmark_provider.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_ 5 #ifndef CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_
6 #define CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_ 6 #define CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "chrome/browser/autocomplete/autocomplete_input.h" 10 #include "chrome/browser/autocomplete/autocomplete_input.h"
11 #include "chrome/browser/autocomplete/autocomplete_match.h" 11 #include "chrome/browser/autocomplete/autocomplete_match.h"
12 #include "chrome/browser/autocomplete/autocomplete_provider.h" 12 #include "chrome/browser/autocomplete/autocomplete_provider.h"
13 #include "components/query_parser/snippet.h" 13 #include "components/query_parser/snippet.h"
14 14
15 class BookmarkModel; 15 class BookmarkModel;
16 struct BookmarkTitleMatch; 16 struct BookmarkMatch;
17 class Profile; 17 class Profile;
18 18
19 // This class is an autocomplete provider which quickly (and synchronously) 19 // This class is an autocomplete provider which quickly (and synchronously)
20 // provides autocomplete suggestions based on the titles of bookmarks. Page 20 // provides autocomplete suggestions based on the titles of bookmarks. Page
21 // titles, URLs, and typed and visit counts of the bookmarks are not currently 21 // titles, URLs, and typed and visit counts of the bookmarks are not currently
22 // taken into consideration as those factors will have been used by the 22 // taken into consideration as those factors will have been used by the
23 // HistoryQuickProvider (HQP) while identifying suggestions. 23 // HistoryQuickProvider (HQP) while identifying suggestions.
24 // 24 //
25 // TODO(mrossetti): Propose a way to coordinate with the HQP the taking of typed 25 // TODO(mrossetti): Propose a way to coordinate with the HQP the taking of typed
26 // and visit counts and last visit dates, etc. into consideration while scoring. 26 // and visit counts and last visit dates, etc. into consideration while scoring.
(...skipping 14 matching lines...) Expand all
41 41
42 private: 42 private:
43 FRIEND_TEST_ALL_PREFIXES(BookmarkProviderTest, InlineAutocompletion); 43 FRIEND_TEST_ALL_PREFIXES(BookmarkProviderTest, InlineAutocompletion);
44 44
45 virtual ~BookmarkProvider(); 45 virtual ~BookmarkProvider();
46 46
47 // Performs the actual matching of |input| over the bookmarks and fills in 47 // Performs the actual matching of |input| over the bookmarks and fills in
48 // |matches_|. 48 // |matches_|.
49 void DoAutocomplete(const AutocompleteInput& input); 49 void DoAutocomplete(const AutocompleteInput& input);
50 50
51 // Compose an AutocompleteMatch based on |title_match| that has 1) the URL of 51 // Compose an AutocompleteMatch based on |match| that has 1) the URL of
52 // title_match's bookmark, and 2) the bookmark's title, not the URL's page 52 // |match|'s bookmark, and 2) the bookmark's title, not the URL's page
53 // title, as the description. |input| is used to compute the match's 53 // title, as the description. |input| is used to compute the match's
54 // inline_autocompletion. |fixed_up_input| is used in that way as well; 54 // inline_autocompletion. |fixed_up_input| is used in that way as well;
55 // it's passed separately so this function doesn't have to compute it. 55 // it's passed separately so this function doesn't have to compute it.
56 AutocompleteMatch TitleMatchToACMatch( 56 AutocompleteMatch BookmarkMatchToACMatch(
57 const AutocompleteInput& input, 57 const AutocompleteInput& input,
58 const AutocompleteInput& fixed_up_input, 58 const AutocompleteInput& fixed_up_input,
59 const BookmarkTitleMatch& title_match); 59 const BookmarkMatch& match);
60 60
61 // Converts |positions| into ACMatchClassifications and returns the 61 // Converts |positions| into ACMatchClassifications and returns the
62 // classifications. |text_length| is used to determine the need to add an 62 // classifications. |text_length| is used to determine the need to add an
63 // 'unhighlighted' classification span so the tail of the source string 63 // 'unhighlighted' classification span so the tail of the source string
64 // properly highlighted. 64 // properly highlighted.
65 static ACMatchClassifications ClassificationsFromMatch( 65 static ACMatchClassifications ClassificationsFromMatch(
66 const query_parser::Snippet::MatchPositions& positions, 66 const query_parser::Snippet::MatchPositions& positions,
67 size_t text_length); 67 size_t text_length,
68 bool is_url);
68 69
69 BookmarkModel* bookmark_model_; 70 BookmarkModel* bookmark_model_;
70 71
72 // True if we should use matches in the URL for scoring.
73 const bool score_using_url_matches_;
74
71 // Languages used during the URL formatting. 75 // Languages used during the URL formatting.
72 std::string languages_; 76 std::string languages_;
73 77
74 DISALLOW_COPY_AND_ASSIGN(BookmarkProvider); 78 DISALLOW_COPY_AND_ASSIGN(BookmarkProvider);
75 }; 79 };
76 80
77 #endif // CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_ 81 #endif // CHROME_BROWSER_AUTOCOMPLETE_BOOKMARK_PROVIDER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/autocomplete/bookmark_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698