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

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

Issue 282183002: [AiS] Enable AiS flag on all platforms (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/command_line.h"
13 #include "base/i18n/break_iterator.h" 12 #include "base/i18n/break_iterator.h"
14 #include "base/i18n/case_conversion.h" 13 #include "base/i18n/case_conversion.h"
15 #include "base/json/json_string_value_serializer.h" 14 #include "base/json/json_string_value_serializer.h"
16 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
17 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
18 #include "base/prefs/pref_service.h" 17 #include "base/prefs/pref_service.h"
19 #include "base/rand_util.h" 18 #include "base/rand_util.h"
20 #include "base/strings/string_util.h" 19 #include "base/strings/string_util.h"
21 #include "base/strings/utf_string_conversions.h" 20 #include "base/strings/utf_string_conversions.h"
22 #include "chrome/browser/autocomplete/autocomplete_classifier.h" 21 #include "chrome/browser/autocomplete/autocomplete_classifier.h"
23 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" 22 #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h"
24 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h" 23 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
25 #include "chrome/browser/autocomplete/autocomplete_result.h" 24 #include "chrome/browser/autocomplete/autocomplete_result.h"
26 #include "chrome/browser/autocomplete/keyword_provider.h" 25 #include "chrome/browser/autocomplete/keyword_provider.h"
27 #include "chrome/browser/autocomplete/url_prefix.h" 26 #include "chrome/browser/autocomplete/url_prefix.h"
28 #include "chrome/browser/google/google_util.h" 27 #include "chrome/browser/google/google_util.h"
29 #include "chrome/browser/history/history_service.h" 28 #include "chrome/browser/history/history_service.h"
30 #include "chrome/browser/history/history_service_factory.h" 29 #include "chrome/browser/history/history_service_factory.h"
31 #include "chrome/browser/history/in_memory_database.h" 30 #include "chrome/browser/history/in_memory_database.h"
32 #include "chrome/browser/metrics/variations/variations_http_header_provider.h" 31 #include "chrome/browser/metrics/variations/variations_http_header_provider.h"
33 #include "chrome/browser/omnibox/omnibox_field_trial.h" 32 #include "chrome/browser/omnibox/omnibox_field_trial.h"
34 #include "chrome/browser/profiles/profile.h" 33 #include "chrome/browser/profiles/profile.h"
35 #include "chrome/browser/search/search.h" 34 #include "chrome/browser/search/search.h"
36 #include "chrome/browser/search_engines/template_url_prepopulate_data.h" 35 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
37 #include "chrome/browser/search_engines/template_url_service.h" 36 #include "chrome/browser/search_engines/template_url_service.h"
38 #include "chrome/browser/search_engines/template_url_service_factory.h" 37 #include "chrome/browser/search_engines/template_url_service_factory.h"
39 #include "chrome/browser/ui/search/instant_controller.h" 38 #include "chrome/browser/ui/search/instant_controller.h"
40 #include "chrome/common/chrome_switches.h"
41 #include "chrome/common/pref_names.h" 39 #include "chrome/common/pref_names.h"
42 #include "chrome/common/url_constants.h" 40 #include "chrome/common/url_constants.h"
43 #include "content/public/browser/user_metrics.h" 41 #include "content/public/browser/user_metrics.h"
44 #include "grit/generated_resources.h" 42 #include "grit/generated_resources.h"
45 #include "net/base/escape.h" 43 #include "net/base/escape.h"
46 #include "net/base/load_flags.h" 44 #include "net/base/load_flags.h"
47 #include "net/base/net_util.h" 45 #include "net/base/net_util.h"
48 #include "net/http/http_request_headers.h" 46 #include "net/http/http_request_headers.h"
49 #include "net/url_request/url_fetcher.h" 47 #include "net/url_request/url_fetcher.h"
50 #include "net/url_request/url_request_status.h" 48 #include "net/url_request/url_request_status.h"
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 int id, 632 int id,
635 const TemplateURL* template_url, 633 const TemplateURL* template_url,
636 const AutocompleteInput& input) { 634 const AutocompleteInput& input) {
637 if (!template_url || template_url->suggestions_url().empty()) 635 if (!template_url || template_url->suggestions_url().empty())
638 return NULL; 636 return NULL;
639 637
640 // Bail if the suggestion URL is invalid with the given replacements. 638 // Bail if the suggestion URL is invalid with the given replacements.
641 TemplateURLRef::SearchTermsArgs search_term_args(input.text()); 639 TemplateURLRef::SearchTermsArgs search_term_args(input.text());
642 search_term_args.cursor_position = input.cursor_position(); 640 search_term_args.cursor_position = input.cursor_position();
643 search_term_args.page_classification = input.current_page_classification(); 641 search_term_args.page_classification = input.current_page_classification();
644 #if defined(OS_ANDROID) 642 if (chrome::IsAnswersInSuggestEnabled())
645 if (CommandLine::ForCurrentProcess()->HasSwitch(
646 switches::kEnableAnswersInSuggest))
647 search_term_args.session_token = GetSessionToken(); 643 search_term_args.session_token = GetSessionToken();
648 #endif
649 GURL suggest_url(template_url->suggestions_url_ref().ReplaceSearchTerms( 644 GURL suggest_url(template_url->suggestions_url_ref().ReplaceSearchTerms(
650 search_term_args)); 645 search_term_args));
651 if (!suggest_url.is_valid()) 646 if (!suggest_url.is_valid())
652 return NULL; 647 return NULL;
653 // Send the current page URL if user setting and URL requirements are met and 648 // Send the current page URL if user setting and URL requirements are met and
654 // the user is in the field trial. 649 // the user is in the field trial.
655 if (CanSendURL(current_page_url_, suggest_url, template_url, 650 if (CanSendURL(current_page_url_, suggest_url, template_url,
656 input.current_page_classification(), profile_) && 651 input.current_page_classification(), profile_) &&
657 OmniboxFieldTrial::InZeroSuggestAfterTypingFieldTrial()) { 652 OmniboxFieldTrial::InZeroSuggestAfterTypingFieldTrial()) {
658 search_term_args.current_page_url = current_page_url_.spec(); 653 search_term_args.current_page_url = current_page_url_.spec();
(...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after
1149 std::string raw_data; 1144 std::string raw_data;
1150 base::RandBytes(WriteInto(&raw_data, kTokenBytes + 1), kTokenBytes); 1145 base::RandBytes(WriteInto(&raw_data, kTokenBytes + 1), kTokenBytes);
1151 base::Base64Encode(raw_data, &current_token_); 1146 base::Base64Encode(raw_data, &current_token_);
1152 } 1147 }
1153 1148
1154 // Extend expiration time another 60 seconds. 1149 // Extend expiration time another 60 seconds.
1155 token_expiration_time_ = current_time + base::TimeDelta::FromSeconds(60); 1150 token_expiration_time_ = current_time + base::TimeDelta::FromSeconds(60);
1156 1151
1157 return current_token_; 1152 return current_token_;
1158 } 1153 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/autocomplete/search_provider_unittest.cc » ('j') | chrome/browser/search/search.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698