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

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

Issue 11522009: X-Chrome-Variations logic refactoring (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Addressed all remaining comments. Created 8 years 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/callback.h" 10 #include "base/callback.h"
11 #include "base/i18n/break_iterator.h" 11 #include "base/i18n/break_iterator.h"
12 #include "base/i18n/case_conversion.h" 12 #include "base/i18n/case_conversion.h"
13 #include "base/i18n/icu_string_conversions.h" 13 #include "base/i18n/icu_string_conversions.h"
14 #include "base/json/json_string_value_serializer.h" 14 #include "base/json/json_string_value_serializer.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/string16.h" 17 #include "base/string16.h"
18 #include "base/string_util.h" 18 #include "base/string_util.h"
19 #include "base/utf_string_conversions.h" 19 #include "base/utf_string_conversions.h"
20 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 20 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
21 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 21 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
22 #include "chrome/browser/autocomplete/autocomplete_match.h" 22 #include "chrome/browser/autocomplete/autocomplete_match.h"
23 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" 23 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
24 #include "chrome/browser/autocomplete/autocomplete_result.h" 24 #include "chrome/browser/autocomplete/autocomplete_result.h"
25 #include "chrome/browser/autocomplete/history_url_provider.h" 25 #include "chrome/browser/autocomplete/history_url_provider.h"
26 #include "chrome/browser/autocomplete/keyword_provider.h" 26 #include "chrome/browser/autocomplete/keyword_provider.h"
27 #include "chrome/browser/autocomplete/url_prefix.h" 27 #include "chrome/browser/autocomplete/url_prefix.h"
28 #include "chrome/browser/chrome_metrics_helper.h"
28 #include "chrome/browser/history/history.h" 29 #include "chrome/browser/history/history.h"
29 #include "chrome/browser/history/history_service_factory.h" 30 #include "chrome/browser/history/history_service_factory.h"
30 #include "chrome/browser/history/in_memory_database.h" 31 #include "chrome/browser/history/in_memory_database.h"
31 #include "chrome/browser/net/url_fixer_upper.h" 32 #include "chrome/browser/net/url_fixer_upper.h"
32 #include "chrome/browser/prefs/pref_service.h" 33 #include "chrome/browser/prefs/pref_service.h"
33 #include "chrome/browser/profiles/profile.h" 34 #include "chrome/browser/profiles/profile.h"
34 #include "chrome/browser/search_engines/search_engine_type.h" 35 #include "chrome/browser/search_engines/search_engine_type.h"
35 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 36 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
36 #include "chrome/browser/search_engines/template_url_service.h" 37 #include "chrome/browser/search_engines/template_url_service.h"
37 #include "chrome/browser/search_engines/template_url_service_factory.h" 38 #include "chrome/browser/search_engines/template_url_service_factory.h"
38 #include "chrome/browser/ui/browser_instant_controller.h" 39 #include "chrome/browser/ui/browser_instant_controller.h"
39 #include "chrome/browser/ui/search/search.h" 40 #include "chrome/browser/ui/search/search.h"
40 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
41 #include "chrome/common/url_constants.h" 42 #include "chrome/common/url_constants.h"
42 #include "googleurl/src/url_util.h" 43 #include "googleurl/src/url_util.h"
43 #include "grit/generated_resources.h" 44 #include "grit/generated_resources.h"
44 #include "net/base/escape.h" 45 #include "net/base/escape.h"
45 #include "net/base/load_flags.h" 46 #include "net/base/load_flags.h"
46 #include "net/base/net_util.h" 47 #include "net/base/net_util.h"
48 #include "net/http/http_request_headers.h"
47 #include "net/http/http_response_headers.h" 49 #include "net/http/http_response_headers.h"
48 #include "net/url_request/url_fetcher.h" 50 #include "net/url_request/url_fetcher.h"
49 #include "net/url_request/url_request_status.h" 51 #include "net/url_request/url_request_status.h"
50 #include "ui/base/l10n/l10n_util.h" 52 #include "ui/base/l10n/l10n_util.h"
51 53
52 using base::Time; 54 using base::Time;
53 using base::TimeDelta; 55 using base::TimeDelta;
54 56
55 namespace { 57 namespace {
56 58
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 if (!suggest_url.is_valid()) 625 if (!suggest_url.is_valid())
624 return NULL; 626 return NULL;
625 627
626 suggest_results_pending_++; 628 suggest_results_pending_++;
627 LogOmniboxSuggestRequest(REQUEST_SENT); 629 LogOmniboxSuggestRequest(REQUEST_SENT);
628 630
629 net::URLFetcher* fetcher = 631 net::URLFetcher* fetcher =
630 net::URLFetcher::Create(id, suggest_url, net::URLFetcher::GET, this); 632 net::URLFetcher::Create(id, suggest_url, net::URLFetcher::GET, this);
631 fetcher->SetRequestContext(profile_->GetRequestContext()); 633 fetcher->SetRequestContext(profile_->GetRequestContext());
632 fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES); 634 fetcher->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES);
635 // Add Chrome experiment state to the request headers.
636 net::HttpRequestHeaders headers;
637 ChromeMetricsHelper::GetInstance()->AppendHeaders(
638 fetcher->GetOriginalURL(), profile_->IsOffTheRecord(), false, &headers);
639 fetcher->SetExtraRequestHeaders(headers.ToString());
633 fetcher->Start(); 640 fetcher->Start();
634 return fetcher; 641 return fetcher;
635 } 642 }
636 643
637 bool SearchProvider::ParseSuggestResults(Value* root_val, bool is_keyword) { 644 bool SearchProvider::ParseSuggestResults(Value* root_val, bool is_keyword) {
638 // TODO(pkasting): Fix |have_suggest_results_|; see http://crbug.com/130631 645 // TODO(pkasting): Fix |have_suggest_results_|; see http://crbug.com/130631
639 have_suggest_results_ = false; 646 have_suggest_results_ = false;
640 647
641 string16 query; 648 string16 query;
642 ListValue* root_list = NULL; 649 ListValue* root_list = NULL;
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after
1221 } 1228 }
1222 1229
1223 void SearchProvider::UpdateDone() { 1230 void SearchProvider::UpdateDone() {
1224 // We're done when the timer isn't running, there are no suggest queries 1231 // We're done when the timer isn't running, there are no suggest queries
1225 // pending, and we're not waiting on instant. 1232 // pending, and we're not waiting on instant.
1226 done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) && 1233 done_ = (!timer_.IsRunning() && (suggest_results_pending_ == 0) &&
1227 (instant_finalized_ || 1234 (instant_finalized_ ||
1228 (!chrome::BrowserInstantController::IsInstantEnabled(profile_) && 1235 (!chrome::BrowserInstantController::IsInstantEnabled(profile_) &&
1229 !chrome::search::IsInstantExtendedAPIEnabled(profile_)))); 1236 !chrome::search::IsInstantExtendedAPIEnabled(profile_))));
1230 } 1237 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698