summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete/history_quick_provider.cc
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 14:58:21 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-15 14:58:21 +0000
commitb60ae4b0ea0bcdd455e45a4971da0ddfc6464c69 (patch)
treea42e9aab2c457c4018c0218afa7673460262dd08 /chrome/browser/autocomplete/history_quick_provider.cc
parentbe762d998ddb7f94f5192e373e9fd339eb3d5397 (diff)
downloadchromium_src-b60ae4b0ea0bcdd455e45a4971da0ddfc6464c69.zip
chromium_src-b60ae4b0ea0bcdd455e45a4971da0ddfc6464c69.tar.gz
chromium_src-b60ae4b0ea0bcdd455e45a4971da0ddfc6464c69.tar.bz2
net: Move UnescapeRule into the net namespace.
BUG=64263 TEST=None R=willchan@chromium.org Review URL: http://codereview.chromium.org/8552002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110085 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/history_quick_provider.cc')
-rw-r--r--chrome/browser/autocomplete/history_quick_provider.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/history_quick_provider.cc b/chrome/browser/autocomplete/history_quick_provider.cc
index 7dba1cc..15c53b8 100644
--- a/chrome/browser/autocomplete/history_quick_provider.cc
+++ b/chrome/browser/autocomplete/history_quick_provider.cc
@@ -89,7 +89,7 @@ void HistoryQuickProvider::DoAutocomplete() {
// Get the matching URLs from the DB.
string16 term_string = autocomplete_input_.text();
term_string = net::UnescapeURLComponent(term_string,
- UnescapeRule::SPACES | UnescapeRule::URL_SPECIAL_CHARS);
+ net::UnescapeRule::SPACES | net::UnescapeRule::URL_SPECIAL_CHARS);
history::String16Vector terms(
history::String16VectorFromString16(term_string, false));
ScoredHistoryMatches matches = GetIndex()->HistoryItemsForTerms(terms);
@@ -132,9 +132,8 @@ AutocompleteMatch HistoryQuickProvider::QuickMatchToACMatch(
// Format the URL autocomplete presentation.
std::vector<size_t> offsets =
OffsetsFromTermMatches(history_match.url_matches);
- match.contents =
- net::FormatUrlWithOffsets(info.url(), languages_, net::kFormatUrlOmitAll,
- UnescapeRule::SPACES, NULL, NULL, &offsets);
+ match.contents = net::FormatUrlWithOffsets(info.url(), languages_,
+ net::kFormatUrlOmitAll, net::UnescapeRule::SPACES, NULL, NULL, &offsets);
history::TermMatches new_matches =
ReplaceOffsetsInTermMatches(history_match.url_matches, offsets);
match.contents_class =