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/predictors/autocomplete_action_predictor.h" | 5 #include "chrome/browser/predictors/autocomplete_action_predictor.h" |
6 | 6 |
7 #include <math.h> | 7 #include <math.h> |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/bind.h" | 12 #include "base/bind.h" |
13 #include "base/guid.h" | 13 #include "base/guid.h" |
14 #include "base/i18n/case_conversion.h" | 14 #include "base/i18n/case_conversion.h" |
15 #include "base/macros.h" | 15 #include "base/macros.h" |
16 #include "base/metrics/histogram.h" | 16 #include "base/metrics/histogram.h" |
| 17 #include "base/stl_util.h" |
17 #include "base/strings/string_util.h" | 18 #include "base/strings/string_util.h" |
18 #include "base/strings/stringprintf.h" | 19 #include "base/strings/stringprintf.h" |
19 #include "base/strings/utf_string_conversions.h" | 20 #include "base/strings/utf_string_conversions.h" |
20 #include "chrome/browser/chrome_notification_types.h" | 21 #include "chrome/browser/chrome_notification_types.h" |
21 #include "chrome/browser/history/history_service_factory.h" | 22 #include "chrome/browser/history/history_service_factory.h" |
22 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" | 23 #include "chrome/browser/predictors/autocomplete_action_predictor_factory.h" |
23 #include "chrome/browser/predictors/predictor_database.h" | 24 #include "chrome/browser/predictors/predictor_database.h" |
24 #include "chrome/browser/predictors/predictor_database_factory.h" | 25 #include "chrome/browser/predictors/predictor_database_factory.h" |
25 #include "chrome/browser/prerender/prerender_field_trial.h" | 26 #include "chrome/browser/prerender/prerender_field_trial.h" |
26 #include "chrome/browser/prerender/prerender_handle.h" | 27 #include "chrome/browser/prerender/prerender_handle.h" |
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 lower_user_text); | 122 lower_user_text); |
122 | 123 |
123 if (match_it == transitional_matches_.end()) { | 124 if (match_it == transitional_matches_.end()) { |
124 TransitionalMatch transitional_match; | 125 TransitionalMatch transitional_match; |
125 transitional_match.user_text = lower_user_text; | 126 transitional_match.user_text = lower_user_text; |
126 match_it = transitional_matches_.insert(transitional_matches_.end(), | 127 match_it = transitional_matches_.insert(transitional_matches_.end(), |
127 transitional_match); | 128 transitional_match); |
128 } | 129 } |
129 | 130 |
130 for (const auto& i : result) { | 131 for (const auto& i : result) { |
131 if (std::find(match_it->urls.begin(), match_it->urls.end(), | 132 if (!ContainsValue(match_it->urls, i.destination_url)) |
132 i.destination_url) == match_it->urls.end()) { | |
133 match_it->urls.push_back(i.destination_url); | 133 match_it->urls.push_back(i.destination_url); |
134 } | |
135 } | 134 } |
136 } | 135 } |
137 | 136 |
138 void AutocompleteActionPredictor::ClearTransitionalMatches() { | 137 void AutocompleteActionPredictor::ClearTransitionalMatches() { |
139 transitional_matches_.clear(); | 138 transitional_matches_.clear(); |
140 } | 139 } |
141 | 140 |
142 void AutocompleteActionPredictor::CancelPrerender() { | 141 void AutocompleteActionPredictor::CancelPrerender() { |
143 // If the prerender has already been abandoned, leave it to its own timeout; | 142 // If the prerender has already been abandoned, leave it to its own timeout; |
144 // this normally gets called immediately after OnOmniboxOpenedUrl. | 143 // this normally gets called immediately after OnOmniboxOpenedUrl. |
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
592 AutocompleteActionPredictor::TransitionalMatch::TransitionalMatch() { | 591 AutocompleteActionPredictor::TransitionalMatch::TransitionalMatch() { |
593 } | 592 } |
594 | 593 |
595 AutocompleteActionPredictor::TransitionalMatch::TransitionalMatch( | 594 AutocompleteActionPredictor::TransitionalMatch::TransitionalMatch( |
596 const TransitionalMatch& other) = default; | 595 const TransitionalMatch& other) = default; |
597 | 596 |
598 AutocompleteActionPredictor::TransitionalMatch::~TransitionalMatch() { | 597 AutocompleteActionPredictor::TransitionalMatch::~TransitionalMatch() { |
599 } | 598 } |
600 | 599 |
601 } // namespace predictors | 600 } // namespace predictors |
OLD | NEW |