chrome/browser/android/contextualsearch/contextual_search_delegate.cc - Issue 2816383002: Remove non-const version of GetDefaultSearchProvider() and make all callers call the const version

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: chrome/browser/android/contextualsearch/contextual_search_delegate.cc

Issue 2816383002: Remove non-const version of GetDefaultSearchProvider() and make all callers call the const version (Closed)

Patch Set: Fix instant extended interactive ui test for calling the const version of GetDefaultSearchProvider() Created 3 years, 8 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 | « no previous file | chrome/browser/android/locale/special_locale_handler.cc » ('j') | chrome/browser/search_engines/template_url_service_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/android/contextualsearch/contextual_search_delegate.cc

diff --git a/chrome/browser/android/contextualsearch/contextual_search_delegate.cc b/chrome/browser/android/contextualsearch/contextual_search_delegate.cc

index 6ead9b14dcadd8daa8c9e222b3edab405f944f00..20f67b0707818f47ce4c8ed2d40e2854f64c7128 100644

--- a/chrome/browser/android/contextualsearch/contextual_search_delegate.cc

+++ b/chrome/browser/android/contextualsearch/contextual_search_delegate.cc

@@ -250,7 +250,8 @@ std::string ContextualSearchDelegate::BuildRequestUrl(

return std::string();

}

- TemplateURL* template_url = template_url_service_->GetDefaultSearchProvider();

+ const TemplateURL* template_url =

+ template_url_service_->GetDefaultSearchProvider();

TemplateURLRef::SearchTermsArgs search_terms_args =

TemplateURLRef::SearchTermsArgs(base::string16());

@@ -402,7 +403,7 @@ bool ContextualSearchDelegate::CanSendPageURL(

return false;

// Ensure that the default search provider is Google.

- TemplateURL* default_search_provider =

+ const TemplateURL* default_search_provider =

template_url_service->GetDefaultSearchProvider();

bool is_default_search_provider_google =

default_search_provider &&

« no previous file with comments | « no previous file | chrome/browser/android/locale/special_locale_handler.cc » ('j') | chrome/browser/search_engines/template_url_service_unittest.cc » ('J')