chrome/browser/autocomplete/zero_suggest_provider.cc - Issue 447183003: Move OmniboxFieldTrial to components

Side by Side Diff: chrome/browser/autocomplete/zero_suggest_provider.cc

Issue 447183003: Move OmniboxFieldTrial to components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase & fix switch indent Created 6 years, 4 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/autocomplete/shortcuts_provider.cc ('k') | chrome/browser/autocomplete/zero_suggest_provider_unittest.cc » ('j') | no next file with comments »

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/autocomplete/zero_suggest_provider.h"	5 #include "chrome/browser/autocomplete/zero_suggest_provider.h"

6	6

7 #include "base/callback.h"	7 #include "base/callback.h"

8 #include "base/i18n/case_conversion.h"	8 #include "base/i18n/case_conversion.h"

9 #include "base/json/json_string_value_serializer.h"	9 #include "base/json/json_string_value_serializer.h"

10 #include "base/metrics/histogram.h"	10 #include "base/metrics/histogram.h"

11 #include "base/prefs/pref_service.h"	11 #include "base/prefs/pref_service.h"

12 #include "base/strings/string16.h"	12 #include "base/strings/string16.h"

13 #include "base/strings/string_util.h"	13 #include "base/strings/string_util.h"

14 #include "base/strings/utf_string_conversions.h"	14 #include "base/strings/utf_string_conversions.h"

15 #include "base/time/time.h"	15 #include "base/time/time.h"

16 #include "chrome/browser/autocomplete/autocomplete_classifier.h"	16 #include "chrome/browser/autocomplete/autocomplete_classifier.h"

17 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"	17 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"

18 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"	18 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"

19 #include "chrome/browser/autocomplete/history_url_provider.h"	19 #include "chrome/browser/autocomplete/history_url_provider.h"

20 #include "chrome/browser/autocomplete/search_provider.h"	20 #include "chrome/browser/autocomplete/search_provider.h"

21 #include "chrome/browser/history/history_types.h"	21 #include "chrome/browser/history/history_types.h"

22 #include "chrome/browser/history/top_sites.h"	22 #include "chrome/browser/history/top_sites.h"

23 #include "chrome/browser/omnibox/omnibox_field_trial.h"

24 #include "chrome/browser/profiles/profile.h"	23 #include "chrome/browser/profiles/profile.h"

25 #include "chrome/common/pref_names.h"	24 #include "chrome/common/pref_names.h"

26 #include "components/metrics/proto/omnibox_input_type.pb.h"	25 #include "components/metrics/proto/omnibox_input_type.pb.h"

27 #include "components/omnibox/autocomplete_input.h"	26 #include "components/omnibox/autocomplete_input.h"

28 #include "components/omnibox/autocomplete_match.h"	27 #include "components/omnibox/autocomplete_match.h"

29 #include "components/omnibox/autocomplete_provider_listener.h"	28 #include "components/omnibox/autocomplete_provider_listener.h"

	29 #include "components/omnibox/omnibox_field_trial.h"

30 #include "components/pref_registry/pref_registry_syncable.h"	30 #include "components/pref_registry/pref_registry_syncable.h"

31 #include "components/search_engines/template_url_service.h"	31 #include "components/search_engines/template_url_service.h"

32 #include "components/variations/variations_http_header_provider.h"	32 #include "components/variations/variations_http_header_provider.h"

33 #include "content/public/browser/user_metrics.h"	33 #include "content/public/browser/user_metrics.h"

34 #include "net/base/escape.h"	34 #include "net/base/escape.h"

35 #include "net/base/load_flags.h"	35 #include "net/base/load_flags.h"

36 #include "net/base/net_util.h"	36 #include "net/base/net_util.h"

37 #include "net/http/http_request_headers.h"	37 #include "net/http/http_request_headers.h"

38 #include "net/url_request/url_fetcher.h"	38 #include "net/url_request/url_fetcher.h"

39 #include "net/url_request/url_request_status.h"	39 #include "net/url_request/url_request_status.h"

(...skipping 418 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
458 prefs::kZeroSuggestCachedResults);	458 prefs::kZeroSuggestCachedResults);

459 if (!json_data.empty()) {	459 if (!json_data.empty()) {

460 scoped_ptr<base::Value> data(	460 scoped_ptr<base::Value> data(

461 SearchSuggestionParser::DeserializeJsonData(json_data));	461 SearchSuggestionParser::DeserializeJsonData(json_data));

462 if (data && ParseSuggestResults(*data.get(), false, &results_)) {	462 if (data && ParseSuggestResults(*data.get(), false, &results_)) {

463 ConvertResultsToAutocompleteMatches();	463 ConvertResultsToAutocompleteMatches();

464 results_from_cache_ = !matches_.empty();	464 results_from_cache_ = !matches_.empty();

465 }	465 }

466 }	466 }

467 }	467 }

OLD	NEW