components/omnibox/browser/base_search_provider.cc - Issue 1983773002: Cache SearchEngineType of TemplateURL

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/omnibox/browser/base_search_provider.cc

Issue 1983773002: Cache SearchEngineType of TemplateURL (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@refactor-extracting-terms-from-template-url

Patch Set: Created 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/app_list/start_page_service.cc ('k') | components/omnibox/browser/search_provider.cc » ('j') | components/search_engines/keyword_table.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/omnibox/browser/base_search_provider.cc

diff --git a/components/omnibox/browser/base_search_provider.cc b/components/omnibox/browser/base_search_provider.cc

index 6a88c0476f2ce3cd1de7792a2b5a169e208474fc..ae74dde9e27bab6a9cd306ff0c892aeee2a1a1f0 100644

--- a/components/omnibox/browser/base_search_provider.cc

+++ b/components/omnibox/browser/base_search_provider.cc

@@ -20,7 +20,6 @@

#include "components/omnibox/browser/omnibox_field_trial.h"

#include "components/omnibox/browser/suggestion_answer.h"

#include "components/search_engines/template_url.h"

-#include "components/search_engines/template_url_prepopulate_data.h"

#include "components/search_engines/template_url_service.h"

#include "net/base/registry_controlled_domains/registry_controlled_domain.h"

#include "net/url_request/url_fetcher.h"

@@ -321,8 +320,7 @@ bool BaseSearchProvider::ZeroSuggestEnabled(

// (currently only the prepopulated Google provider).

if (template_url == NULL ||

!template_url->SupportsReplacement(search_terms_data) ||

- TemplateURLPrepopulateData::GetEngineType(

- *template_url, search_terms_data) != SEARCH_ENGINE_GOOGLE)

+ template_url->GetEngineType(search_terms_data) != SEARCH_ENGINE_GOOGLE)

return false;

return true;