chrome/browser/autocomplete/search_provider.cc - Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources.

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

Issue 469993006: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/keyword_provider.cc ('k') | chrome/browser/autofill/autofill_cc_infobar_delegate.cc » ('j') | chrome/browser/password_manager/password_manager_util_win.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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/search_provider.h"	5 #include "chrome/browser/autocomplete/search_provider.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <cmath>	8 #include <cmath>

9	9

10 #include "base/base64.h"	10 #include "base/base64.h"

(...skipping 10 matching lines...) Expand all Loading...
21 #include "base/strings/string_util.h"	21 #include "base/strings/string_util.h"

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

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

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

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

26 #include "chrome/browser/autocomplete/keyword_provider.h"	26 #include "chrome/browser/autocomplete/keyword_provider.h"

27 #include "chrome/browser/history/history_service.h"	27 #include "chrome/browser/history/history_service.h"

28 #include "chrome/browser/history/history_service_factory.h"	28 #include "chrome/browser/history/history_service_factory.h"

29 #include "chrome/browser/profiles/profile.h"	29 #include "chrome/browser/profiles/profile.h"

30 #include "chrome/common/pref_names.h"	30 #include "chrome/common/pref_names.h"

	31 #include "chrome/grit/generated_resources.h"

31 #include "components/google/core/browser/google_util.h"	32 #include "components/google/core/browser/google_util.h"

32 #include "components/history/core/browser/in_memory_database.h"	33 #include "components/history/core/browser/in_memory_database.h"

33 #include "components/history/core/browser/keyword_search_term.h"	34 #include "components/history/core/browser/keyword_search_term.h"

34 #include "components/metrics/proto/omnibox_input_type.pb.h"	35 #include "components/metrics/proto/omnibox_input_type.pb.h"

35 #include "components/omnibox/autocomplete_provider_listener.h"	36 #include "components/omnibox/autocomplete_provider_listener.h"

36 #include "components/omnibox/autocomplete_result.h"	37 #include "components/omnibox/autocomplete_result.h"

37 #include "components/omnibox/omnibox_field_trial.h"	38 #include "components/omnibox/omnibox_field_trial.h"

38 #include "components/omnibox/url_prefix.h"	39 #include "components/omnibox/url_prefix.h"

39 #include "components/search/search.h"	40 #include "components/search/search.h"

40 #include "components/search_engines/template_url_prepopulate_data.h"	41 #include "components/search_engines/template_url_prepopulate_data.h"

41 #include "components/search_engines/template_url_service.h"	42 #include "components/search_engines/template_url_service.h"

42 #include "components/variations/variations_http_header_provider.h"	43 #include "components/variations/variations_http_header_provider.h"

43 #include "grit/generated_resources.h"

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

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

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

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

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

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

50 #include "ui/base/l10n/l10n_util.h"	50 #include "ui/base/l10n/l10n_util.h"

51 #include "url/url_constants.h"	51 #include "url/url_constants.h"

52 #include "url/url_util.h"	52 #include "url/url_util.h"

53	53

(...skipping 1208 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1262 last_answer_seen_.query_type = match->answer_type;	1262 last_answer_seen_.query_type = match->answer_type;

1263 }	1263 }

1264	1264

1265 void SearchProvider::DoAnswersQuery(const AutocompleteInput& input) {	1265 void SearchProvider::DoAnswersQuery(const AutocompleteInput& input) {

1266 // If the query text starts with trimmed input, this is valid prefetch data.	1266 // If the query text starts with trimmed input, this is valid prefetch data.

1267 prefetch_data_ = StartsWith(last_answer_seen_.full_query_text,	1267 prefetch_data_ = StartsWith(last_answer_seen_.full_query_text,

1268 base::CollapseWhitespace(input.text(), false),	1268 base::CollapseWhitespace(input.text(), false),

1269 false) ?	1269 false) ?

1270 last_answer_seen_ : AnswersQueryData();	1270 last_answer_seen_ : AnswersQueryData();

1271 }	1271 }

OLD	NEW