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

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

Issue 366373002: [Variations] Bring variations_http_header_provider to variations component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: properly add infobar_test Created 6 years, 5 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
OLDNEW
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
21 #include "base/strings/utf_string_conversions.h" 21 #include "base/strings/utf_string_conversions.h"
22 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 22 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
23 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 23 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
24 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" 24 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
25 #include "chrome/browser/autocomplete/autocomplete_result.h" 25 #include "chrome/browser/autocomplete/autocomplete_result.h"
26 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 26 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
27 #include "chrome/browser/autocomplete/keyword_provider.h" 27 #include "chrome/browser/autocomplete/keyword_provider.h"
28 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 28 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
29 #include "chrome/browser/history/history_service.h" 29 #include "chrome/browser/history/history_service.h"
30 #include "chrome/browser/history/history_service_factory.h" 30 #include "chrome/browser/history/history_service_factory.h"
31 #include "chrome/browser/metrics/variations/variations_http_header_provider.h"
32 #include "chrome/browser/omnibox/omnibox_field_trial.h" 31 #include "chrome/browser/omnibox/omnibox_field_trial.h"
33 #include "chrome/browser/profiles/profile.h" 32 #include "chrome/browser/profiles/profile.h"
34 #include "chrome/browser/search/search.h" 33 #include "chrome/browser/search/search.h"
35 #include "chrome/browser/search_engines/template_url_service_factory.h" 34 #include "chrome/browser/search_engines/template_url_service_factory.h"
36 #include "chrome/browser/ui/search/instant_controller.h" 35 #include "chrome/browser/ui/search/instant_controller.h"
37 #include "chrome/common/chrome_switches.h" 36 #include "chrome/common/chrome_switches.h"
38 #include "chrome/common/pref_names.h" 37 #include "chrome/common/pref_names.h"
39 #include "components/autocomplete/url_prefix.h" 38 #include "components/autocomplete/url_prefix.h"
40 #include "components/google/core/browser/google_util.h" 39 #include "components/google/core/browser/google_util.h"
41 #include "components/history/core/browser/in_memory_database.h" 40 #include "components/history/core/browser/in_memory_database.h"
42 #include "components/history/core/browser/keyword_search_term.h" 41 #include "components/history/core/browser/keyword_search_term.h"
43 #include "components/metrics/proto/omnibox_input_type.pb.h" 42 #include "components/metrics/proto/omnibox_input_type.pb.h"
44 #include "components/search_engines/template_url_prepopulate_data.h" 43 #include "components/search_engines/template_url_prepopulate_data.h"
45 #include "components/search_engines/template_url_service.h" 44 #include "components/search_engines/template_url_service.h"
45 #include "components/variations/variations_http_header_provider.h"
46 #include "content/public/browser/user_metrics.h" 46 #include "content/public/browser/user_metrics.h"
47 #include "grit/generated_resources.h" 47 #include "grit/generated_resources.h"
48 #include "net/base/escape.h" 48 #include "net/base/escape.h"
49 #include "net/base/load_flags.h" 49 #include "net/base/load_flags.h"
50 #include "net/base/net_util.h" 50 #include "net/base/net_util.h"
51 #include "net/http/http_request_headers.h" 51 #include "net/http/http_request_headers.h"
52 #include "net/url_request/url_fetcher.h" 52 #include "net/url_request/url_fetcher.h"
53 #include "net/url_request/url_request_status.h" 53 #include "net/url_request/url_request_status.h"
54 #include "ui/base/l10n/l10n_util.h" 54 #include "ui/base/l10n/l10n_util.h"
55 #include "url/url_constants.h" 55 #include "url/url_constants.h"
(...skipping 615 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 671
672 suggest_results_pending_++; 672 suggest_results_pending_++;
673 LogOmniboxSuggestRequest(REQUEST_SENT); 673 LogOmniboxSuggestRequest(REQUEST_SENT);
674 674
675 net::URLFetcher* fetcher = 675 net::URLFetcher* fetcher =
676 net::URLFetcher::Create(id, suggest_url, net::URLFetcher::GET, this); 676 net::URLFetcher::Create(id, suggest_url, net::URLFetcher::GET, this);
677 fetcher->SetRequestContext(profile_->GetRequestContext()); 677 fetcher->SetRequestContext(profile_->GetRequestContext());
678 fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES); 678 fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
679 // Add Chrome experiment state to the request headers. 679 // Add Chrome experiment state to the request headers.
680 net::HttpRequestHeaders headers; 680 net::HttpRequestHeaders headers;
681 chrome_variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders( 681 variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders(
682 fetcher->GetOriginalURL(), profile_->IsOffTheRecord(), false, &headers); 682 fetcher->GetOriginalURL(), profile_->IsOffTheRecord(), false, &headers);
683 fetcher->SetExtraRequestHeaders(headers.ToString()); 683 fetcher->SetExtraRequestHeaders(headers.ToString());
684 fetcher->Start(); 684 fetcher->Start();
685 return fetcher; 685 return fetcher;
686 } 686 }
687 687
688 void SearchProvider::ConvertResultsToAutocompleteMatches() { 688 void SearchProvider::ConvertResultsToAutocompleteMatches() {
689 // Convert all the results to matches and add them to a map, so we can keep 689 // Convert all the results to matches and add them to a map, so we can keep
690 // the most relevant match for each result. 690 // the most relevant match for each result.
691 base::TimeTicks start_time(base::TimeTicks::Now()); 691 base::TimeTicks start_time(base::TimeTicks::Now());
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
1166 // Make the base64 encoded value URL and filename safe(see RFC 3548). 1166 // Make the base64 encoded value URL and filename safe(see RFC 3548).
1167 std::replace(current_token_.begin(), current_token_.end(), '+', '-'); 1167 std::replace(current_token_.begin(), current_token_.end(), '+', '-');
1168 std::replace(current_token_.begin(), current_token_.end(), '/', '_'); 1168 std::replace(current_token_.begin(), current_token_.end(), '/', '_');
1169 } 1169 }
1170 1170
1171 // Extend expiration time another 60 seconds. 1171 // Extend expiration time another 60 seconds.
1172 token_expiration_time_ = current_time + base::TimeDelta::FromSeconds(60); 1172 token_expiration_time_ = current_time + base::TimeDelta::FromSeconds(60);
1173 1173
1174 return current_token_; 1174 return current_token_;
1175 } 1175 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/autocomplete/zero_suggest_provider.cc » ('j') | components/infobars/test/infobar_test.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698