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

Side by Side Diff: chrome/browser/autocomplete/zero_suggest_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 (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/autocomplete_match.h" 18 #include "chrome/browser/autocomplete/autocomplete_match.h"
19 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" 19 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
20 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 20 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
21 #include "chrome/browser/autocomplete/history_url_provider.h" 21 #include "chrome/browser/autocomplete/history_url_provider.h"
22 #include "chrome/browser/autocomplete/search_provider.h" 22 #include "chrome/browser/autocomplete/search_provider.h"
23 #include "chrome/browser/history/history_types.h" 23 #include "chrome/browser/history/history_types.h"
24 #include "chrome/browser/history/top_sites.h" 24 #include "chrome/browser/history/top_sites.h"
25 #include "chrome/browser/metrics/variations/variations_http_header_provider.h"
26 #include "chrome/browser/omnibox/omnibox_field_trial.h" 25 #include "chrome/browser/omnibox/omnibox_field_trial.h"
27 #include "chrome/browser/profiles/profile.h" 26 #include "chrome/browser/profiles/profile.h"
28 #include "chrome/browser/search_engines/template_url_service_factory.h" 27 #include "chrome/browser/search_engines/template_url_service_factory.h"
29 #include "chrome/common/pref_names.h" 28 #include "chrome/common/pref_names.h"
30 #include "chrome/common/url_constants.h" 29 #include "chrome/common/url_constants.h"
31 #include "components/autocomplete/autocomplete_input.h" 30 #include "components/autocomplete/autocomplete_input.h"
32 #include "components/metrics/proto/omnibox_input_type.pb.h" 31 #include "components/metrics/proto/omnibox_input_type.pb.h"
33 #include "components/pref_registry/pref_registry_syncable.h" 32 #include "components/pref_registry/pref_registry_syncable.h"
34 #include "components/search_engines/template_url_service.h" 33 #include "components/search_engines/template_url_service.h"
34 #include "components/variations/variations_http_header_provider.h"
35 #include "content/public/browser/user_metrics.h" 35 #include "content/public/browser/user_metrics.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/base/net_util.h" 38 #include "net/base/net_util.h"
39 #include "net/http/http_request_headers.h" 39 #include "net/http/http_request_headers.h"
40 #include "net/url_request/url_fetcher.h" 40 #include "net/url_request/url_fetcher.h"
41 #include "net/url_request/url_request_status.h" 41 #include "net/url_request/url_request_status.h"
42 #include "url/gurl.h" 42 #include "url/gurl.h"
43 43
44 namespace { 44 namespace {
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 suggest_results_pending_ = 0; 309 suggest_results_pending_ = 0;
310 const int kFetcherID = 1; 310 const int kFetcherID = 1;
311 fetcher_.reset( 311 fetcher_.reset(
312 net::URLFetcher::Create(kFetcherID, 312 net::URLFetcher::Create(kFetcherID,
313 suggest_url, 313 suggest_url,
314 net::URLFetcher::GET, this)); 314 net::URLFetcher::GET, this));
315 fetcher_->SetRequestContext(profile_->GetRequestContext()); 315 fetcher_->SetRequestContext(profile_->GetRequestContext());
316 fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES); 316 fetcher_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
317 // Add Chrome experiment state to the request headers. 317 // Add Chrome experiment state to the request headers.
318 net::HttpRequestHeaders headers; 318 net::HttpRequestHeaders headers;
319 chrome_variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders( 319 variations::VariationsHttpHeaderProvider::GetInstance()->AppendHeaders(
320 fetcher_->GetOriginalURL(), profile_->IsOffTheRecord(), false, &headers); 320 fetcher_->GetOriginalURL(), profile_->IsOffTheRecord(), false, &headers);
321 fetcher_->SetExtraRequestHeaders(headers.ToString()); 321 fetcher_->SetExtraRequestHeaders(headers.ToString());
322 fetcher_->Start(); 322 fetcher_->Start();
323 323
324 if (OmniboxFieldTrial::InZeroSuggestMostVisitedFieldTrial()) { 324 if (OmniboxFieldTrial::InZeroSuggestMostVisitedFieldTrial()) {
325 most_visited_urls_.clear(); 325 most_visited_urls_.clear();
326 history::TopSites* ts = profile_->GetTopSites(); 326 history::TopSites* ts = profile_->GetTopSites();
327 if (ts) { 327 if (ts) {
328 ts->GetMostVisitedURLs( 328 ts->GetMostVisitedURLs(
329 base::Bind(&ZeroSuggestProvider::OnMostVisitedUrlsAvailable, 329 base::Bind(&ZeroSuggestProvider::OnMostVisitedUrlsAvailable,
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
455 std::string json_data = profile_->GetPrefs()->GetString( 455 std::string json_data = profile_->GetPrefs()->GetString(
456 prefs::kZeroSuggestCachedResults); 456 prefs::kZeroSuggestCachedResults);
457 if (!json_data.empty()) { 457 if (!json_data.empty()) {
458 scoped_ptr<base::Value> data(DeserializeJsonData(json_data)); 458 scoped_ptr<base::Value> data(DeserializeJsonData(json_data));
459 if (data && ParseSuggestResults(*data.get(), false, &results_)) { 459 if (data && ParseSuggestResults(*data.get(), false, &results_)) {
460 ConvertResultsToAutocompleteMatches(); 460 ConvertResultsToAutocompleteMatches();
461 results_from_cache_ = !matches_.empty(); 461 results_from_cache_ = !matches_.empty();
462 } 462 }
463 } 463 }
464 } 464 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698