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

Side by Side Diff: components/omnibox/browser/history_url_provider.cc

Issue 1651203002: Update components for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
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 #include "components/omnibox/browser/history_url_provider.h" 5 #include "components/omnibox/browser/history_url_provider.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/location.h" 11 #include "base/location.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/prefs/pref_service.h"
16 #include "base/single_thread_task_runner.h" 15 #include "base/single_thread_task_runner.h"
17 #include "base/strings/string_util.h" 16 #include "base/strings/string_util.h"
18 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
19 #include "base/time/time.h" 18 #include "base/time/time.h"
20 #include "components/bookmarks/browser/bookmark_utils.h" 19 #include "components/bookmarks/browser/bookmark_utils.h"
21 #include "components/history/core/browser/history_backend.h" 20 #include "components/history/core/browser/history_backend.h"
22 #include "components/history/core/browser/history_database.h" 21 #include "components/history/core/browser/history_database.h"
23 #include "components/history/core/browser/history_service.h" 22 #include "components/history/core/browser/history_service.h"
24 #include "components/history/core/browser/history_types.h" 23 #include "components/history/core/browser/history_types.h"
25 #include "components/metrics/proto/omnibox_input_type.pb.h" 24 #include "components/metrics/proto/omnibox_input_type.pb.h"
26 #include "components/omnibox/browser/autocomplete_match.h" 25 #include "components/omnibox/browser/autocomplete_match.h"
27 #include "components/omnibox/browser/autocomplete_provider_listener.h" 26 #include "components/omnibox/browser/autocomplete_provider_listener.h"
28 #include "components/omnibox/browser/autocomplete_result.h" 27 #include "components/omnibox/browser/autocomplete_result.h"
29 #include "components/omnibox/browser/in_memory_url_index_types.h" 28 #include "components/omnibox/browser/in_memory_url_index_types.h"
30 #include "components/omnibox/browser/omnibox_field_trial.h" 29 #include "components/omnibox/browser/omnibox_field_trial.h"
31 #include "components/omnibox/browser/scored_history_match.h" 30 #include "components/omnibox/browser/scored_history_match.h"
32 #include "components/omnibox/browser/url_prefix.h" 31 #include "components/omnibox/browser/url_prefix.h"
32 #include "components/prefs/pref_service.h"
33 #include "components/search_engines/search_terms_data.h" 33 #include "components/search_engines/search_terms_data.h"
34 #include "components/search_engines/template_url_service.h" 34 #include "components/search_engines/template_url_service.h"
35 #include "components/url_formatter/url_fixer.h" 35 #include "components/url_formatter/url_fixer.h"
36 #include "components/url_formatter/url_formatter.h" 36 #include "components/url_formatter/url_formatter.h"
37 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 37 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
38 #include "url/gurl.h" 38 #include "url/gurl.h"
39 #include "url/third_party/mozilla/url_parse.h" 39 #include "url/third_party/mozilla/url_parse.h"
40 #include "url/url_util.h" 40 #include "url/url_util.h"
41 41
42 namespace { 42 namespace {
(...skipping 1152 matching lines...) Expand 10 before | Expand all | Expand 10 after
1195 AutocompleteMatch::ClassifyLocationInString(base::string16::npos, 0, 1195 AutocompleteMatch::ClassifyLocationInString(base::string16::npos, 0,
1196 match.contents.length(), ACMatchClassification::URL, 1196 match.contents.length(), ACMatchClassification::URL,
1197 &match.contents_class); 1197 &match.contents_class);
1198 } 1198 }
1199 match.description = info.title(); 1199 match.description = info.title();
1200 match.description_class = 1200 match.description_class =
1201 ClassifyDescription(params.input.text(), match.description); 1201 ClassifyDescription(params.input.text(), match.description);
1202 RecordAdditionalInfoFromUrlRow(info, &match); 1202 RecordAdditionalInfoFromUrlRow(info, &match);
1203 return match; 1203 return match;
1204 } 1204 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698