| Index: chrome/browser/autocomplete/base_search_provider.cc
|
| diff --git a/chrome/browser/autocomplete/base_search_provider.cc b/chrome/browser/autocomplete/base_search_provider.cc
|
| index 82de99b0658b6ec55cac26ffa2dbb41ce9303522..7db7eb6a93a723009290f5ca476f91e24b436a0f 100644
|
| --- a/chrome/browser/autocomplete/base_search_provider.cc
|
| +++ b/chrome/browser/autocomplete/base_search_provider.cc
|
| @@ -116,7 +116,8 @@ BaseSearchProvider::BaseSearchProvider(AutocompleteProviderListener* listener,
|
| : AutocompleteProvider(listener, profile, type),
|
| field_trial_triggered_(false),
|
| field_trial_triggered_in_session_(false),
|
| - suggest_results_pending_(0) {
|
| + suggest_results_pending_(0),
|
| + in_app_list_(false) {
|
| }
|
|
|
| // static
|
| @@ -135,7 +136,7 @@ AutocompleteMatch BaseSearchProvider::CreateSearchSuggestion(
|
| suggestion, type, suggestion, base::string16(), base::string16(),
|
| std::string(), std::string(), from_keyword_provider, 0, false, false,
|
| base::string16()),
|
| - template_url, 0, 0, false);
|
| + template_url, 0, 0, false, false);
|
| }
|
|
|
| void BaseSearchProvider::Stop(bool clear_cached_results) {
|
| @@ -439,7 +440,8 @@ AutocompleteMatch BaseSearchProvider::CreateSearchSuggestion(
|
| const TemplateURL* template_url,
|
| int accepted_suggestion,
|
| int omnibox_start_margin,
|
| - bool append_extra_query_params) {
|
| + bool append_extra_query_params,
|
| + bool from_app_list) {
|
| AutocompleteMatch match(autocomplete_provider, suggestion.relevance(), false,
|
| suggestion.type());
|
|
|
| @@ -494,6 +496,7 @@ AutocompleteMatch BaseSearchProvider::CreateSearchSuggestion(
|
| suggestion.suggest_query_params();
|
| match.search_terms_args->append_extra_query_params =
|
| append_extra_query_params;
|
| + match.search_terms_args->from_app_list = from_app_list;
|
| // This is the destination URL sans assisted query stats. This must be set
|
| // so the AutocompleteController can properly de-dupe; the controller will
|
| // eventually overwrite it before it reaches the user.
|
| @@ -668,7 +671,8 @@ void BaseSearchProvider::AddMatchToMap(const SuggestResult& result,
|
| AutocompleteMatch match = CreateSearchSuggestion(
|
| this, GetInput(result.from_keyword_provider()), result,
|
| GetTemplateURL(result.from_keyword_provider()), accepted_suggestion,
|
| - omnibox_start_margin, ShouldAppendExtraParams(result));
|
| + omnibox_start_margin, ShouldAppendExtraParams(result),
|
| + in_app_list_);
|
| if (!match.destination_url.is_valid())
|
| return;
|
| match.search_terms_args->bookmark_bar_pinned =
|
|
|