summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authormrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-10 19:01:19 +0000
committermrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-10 19:01:19 +0000
commitde7d3e2b40cc6ed38882a93ae4db60918cbcf181 (patch)
tree3bf4f99516f5f842f346b04acce9b12033be9887 /chrome/browser/autocomplete
parentbce86b286647062415396eb6bd814d328ce70c4d (diff)
downloadchromium_src-de7d3e2b40cc6ed38882a93ae4db60918cbcf181.zip
chromium_src-de7d3e2b40cc6ed38882a93ae4db60918cbcf181.tar.gz
chromium_src-de7d3e2b40cc6ed38882a93ae4db60918cbcf181.tar.bz2
Use URLRows rather than std::vector<URLRow>. Also, there is an equivalent TypedUrlVector in a limited sphere so replace that with history::URLRows as well.
BUG=None TEST=None R=pkasting@chromium.org,atwilson@chromium.org Review URL: https://chromiumcodereview.appspot.com/9370036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/history_url_provider.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/autocomplete/history_url_provider.cc b/chrome/browser/autocomplete/history_url_provider.cc
index 9e6a8a9..7e2839c 100644
--- a/chrome/browser/autocomplete/history_url_provider.cc
+++ b/chrome/browser/autocomplete/history_url_provider.cc
@@ -454,8 +454,7 @@ void HistoryURLProvider::DoAutocomplete(history::HistoryBackend* backend,
params->trim_http));
// Get the matching URLs from the DB
- typedef std::vector<history::URLRow> URLRowVector;
- URLRowVector url_matches;
+ history::URLRows url_matches;
history::HistoryMatches history_matches;
for (history::Prefixes::const_iterator i(prefixes_.begin());
@@ -470,7 +469,7 @@ void HistoryURLProvider::DoAutocomplete(history::HistoryBackend* backend,
// reduce the list to the best kMaxMatches results.
db->AutocompleteForPrefix(UTF16ToUTF8(i->prefix + params->input.text()),
kMaxMatches * 2, (backend == NULL), &url_matches);
- for (URLRowVector::const_iterator j(url_matches.begin());
+ for (history::URLRows::const_iterator j(url_matches.begin());
j != url_matches.end(); ++j) {
const history::Prefix* best_prefix = BestPrefix(j->url(), string16());
DCHECK(best_prefix != NULL);