OLD | NEW |
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 #include "chrome/browser/autocomplete/autocomplete_provider.h" | 5 #include "chrome/browser/autocomplete/autocomplete_provider.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/browser/autocomplete/autocomplete_match.h" | 9 #include "chrome/browser/autocomplete/autocomplete_match.h" |
10 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" | 10 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 case TYPE_HISTORY_URL: | 47 case TYPE_HISTORY_URL: |
48 return "HistoryURL"; | 48 return "HistoryURL"; |
49 case TYPE_KEYWORD: | 49 case TYPE_KEYWORD: |
50 return "Keyword"; | 50 return "Keyword"; |
51 case TYPE_SEARCH: | 51 case TYPE_SEARCH: |
52 return "Search"; | 52 return "Search"; |
53 case TYPE_SHORTCUTS: | 53 case TYPE_SHORTCUTS: |
54 return "Shortcuts"; | 54 return "Shortcuts"; |
55 case TYPE_ZERO_SUGGEST: | 55 case TYPE_ZERO_SUGGEST: |
56 return "ZeroSuggest"; | 56 return "ZeroSuggest"; |
| 57 case TYPE_BOOKMARK: |
| 58 return "Bookmark"; |
57 default: | 59 default: |
58 NOTREACHED() << "Unhandled AutocompleteProvider::Type " << type; | 60 NOTREACHED() << "Unhandled AutocompleteProvider::Type " << type; |
59 return "Unknown"; | 61 return "Unknown"; |
60 } | 62 } |
61 } | 63 } |
62 | 64 |
63 void AutocompleteProvider::Stop(bool clear_cached_results) { | 65 void AutocompleteProvider::Stop(bool clear_cached_results) { |
64 done_ = true; | 66 done_ = true; |
65 } | 67 } |
66 | 68 |
(...skipping 15 matching lines...) Expand all Loading... |
82 case TYPE_HISTORY_QUICK: | 84 case TYPE_HISTORY_QUICK: |
83 return metrics::OmniboxEventProto::HISTORY_QUICK; | 85 return metrics::OmniboxEventProto::HISTORY_QUICK; |
84 case TYPE_HISTORY_URL: | 86 case TYPE_HISTORY_URL: |
85 return metrics::OmniboxEventProto::HISTORY_URL; | 87 return metrics::OmniboxEventProto::HISTORY_URL; |
86 case TYPE_KEYWORD: | 88 case TYPE_KEYWORD: |
87 return metrics::OmniboxEventProto::KEYWORD; | 89 return metrics::OmniboxEventProto::KEYWORD; |
88 case TYPE_SEARCH: | 90 case TYPE_SEARCH: |
89 return metrics::OmniboxEventProto::SEARCH; | 91 return metrics::OmniboxEventProto::SEARCH; |
90 case TYPE_SHORTCUTS: | 92 case TYPE_SHORTCUTS: |
91 return metrics::OmniboxEventProto::SHORTCUTS; | 93 return metrics::OmniboxEventProto::SHORTCUTS; |
| 94 case TYPE_BOOKMARK: |
| 95 return metrics::OmniboxEventProto::BOOKMARK; |
92 case TYPE_ZERO_SUGGEST: | 96 case TYPE_ZERO_SUGGEST: |
93 // TODO: Add to OmniboxEventProto::ProviderType. | 97 // TODO: Add to OmniboxEventProto::ProviderType. |
94 default: | 98 default: |
95 NOTREACHED() << "Unhandled AutocompleteProvider::Type " << type_; | 99 NOTREACHED() << "Unhandled AutocompleteProvider::Type " << type_; |
96 return metrics::OmniboxEventProto::UNKNOWN_PROVIDER; | 100 return metrics::OmniboxEventProto::UNKNOWN_PROVIDER; |
97 } | 101 } |
98 } | 102 } |
99 | 103 |
100 void AutocompleteProvider::DeleteMatch(const AutocompleteMatch& match) { | 104 void AutocompleteProvider::DeleteMatch(const AutocompleteMatch& match) { |
101 DLOG(WARNING) << "The AutocompleteProvider '" << GetName() | 105 DLOG(WARNING) << "The AutocompleteProvider '" << GetName() |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
136 if (!profile_) | 140 if (!profile_) |
137 return; | 141 return; |
138 | 142 |
139 BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_); | 143 BookmarkModel* bookmark_model = BookmarkModelFactory::GetForProfile(profile_); |
140 if (!bookmark_model || !bookmark_model->IsLoaded()) | 144 if (!bookmark_model || !bookmark_model->IsLoaded()) |
141 return; | 145 return; |
142 | 146 |
143 for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) | 147 for (ACMatches::iterator i(matches_.begin()); i != matches_.end(); ++i) |
144 i->starred = bookmark_model->IsBookmarked(i->destination_url); | 148 i->starred = bookmark_model->IsBookmarked(i->destination_url); |
145 } | 149 } |
OLD | NEW |