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

Side by Side Diff: components/omnibox/browser/zero_suggest_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/zero_suggest_provider.h" 5 #include "components/omnibox/browser/zero_suggest_provider.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/i18n/case_conversion.h" 10 #include "base/i18n/case_conversion.h"
11 #include "base/json/json_string_value_serializer.h" 11 #include "base/json/json_string_value_serializer.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/metrics/user_metrics.h" 13 #include "base/metrics/user_metrics.h"
14 #include "base/prefs/pref_service.h"
15 #include "base/strings/string16.h" 14 #include "base/strings/string16.h"
16 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
17 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
18 #include "base/time/time.h" 17 #include "base/time/time.h"
19 #include "components/data_use_measurement/core/data_use_user_data.h" 18 #include "components/data_use_measurement/core/data_use_user_data.h"
20 #include "components/history/core/browser/history_types.h" 19 #include "components/history/core/browser/history_types.h"
21 #include "components/history/core/browser/top_sites.h" 20 #include "components/history/core/browser/top_sites.h"
22 #include "components/metrics/proto/omnibox_input_type.pb.h" 21 #include "components/metrics/proto/omnibox_input_type.pb.h"
23 #include "components/omnibox/browser/autocomplete_classifier.h" 22 #include "components/omnibox/browser/autocomplete_classifier.h"
24 #include "components/omnibox/browser/autocomplete_input.h" 23 #include "components/omnibox/browser/autocomplete_input.h"
25 #include "components/omnibox/browser/autocomplete_match.h" 24 #include "components/omnibox/browser/autocomplete_match.h"
26 #include "components/omnibox/browser/autocomplete_provider_listener.h" 25 #include "components/omnibox/browser/autocomplete_provider_listener.h"
27 #include "components/omnibox/browser/history_url_provider.h" 26 #include "components/omnibox/browser/history_url_provider.h"
28 #include "components/omnibox/browser/omnibox_field_trial.h" 27 #include "components/omnibox/browser/omnibox_field_trial.h"
29 #include "components/omnibox/browser/omnibox_pref_names.h" 28 #include "components/omnibox/browser/omnibox_pref_names.h"
30 #include "components/omnibox/browser/search_provider.h" 29 #include "components/omnibox/browser/search_provider.h"
31 #include "components/omnibox/browser/verbatim_match.h" 30 #include "components/omnibox/browser/verbatim_match.h"
32 #include "components/pref_registry/pref_registry_syncable.h" 31 #include "components/pref_registry/pref_registry_syncable.h"
32 #include "components/prefs/pref_service.h"
33 #include "components/search_engines/template_url_service.h" 33 #include "components/search_engines/template_url_service.h"
34 #include "components/url_formatter/url_formatter.h" 34 #include "components/url_formatter/url_formatter.h"
35 #include "components/variations/net/variations_http_headers.h" 35 #include "components/variations/net/variations_http_headers.h"
36 #include "net/base/escape.h" 36 #include "net/base/escape.h"
37 #include "net/base/load_flags.h" 37 #include "net/base/load_flags.h"
38 #include "net/http/http_request_headers.h" 38 #include "net/http/http_request_headers.h"
39 #include "net/url_request/url_fetcher.h" 39 #include "net/url_request/url_fetcher.h"
40 #include "net/url_request/url_request_status.h" 40 #include "net/url_request/url_request_status.h"
41 #include "url/gurl.h" 41 #include "url/gurl.h"
42 42
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 if (!json_data.empty()) { 465 if (!json_data.empty()) {
466 scoped_ptr<base::Value> data( 466 scoped_ptr<base::Value> data(
467 SearchSuggestionParser::DeserializeJsonData(json_data)); 467 SearchSuggestionParser::DeserializeJsonData(json_data));
468 if (data && ParseSuggestResults( 468 if (data && ParseSuggestResults(
469 *data, kDefaultZeroSuggestRelevance, false, &results_)) { 469 *data, kDefaultZeroSuggestRelevance, false, &results_)) {
470 ConvertResultsToAutocompleteMatches(); 470 ConvertResultsToAutocompleteMatches();
471 results_from_cache_ = !matches_.empty(); 471 results_from_cache_ = !matches_.empty();
472 } 472 }
473 } 473 }
474 } 474 }
OLDNEW
« no previous file with comments | « components/omnibox/browser/shortcuts_provider.cc ('k') | components/omnibox/browser/zero_suggest_provider_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698