components/search_engines/template_url_service.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: components/search_engines/template_url_service.cc

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

Patch Set: Fix compiler error for iOS build by calling the const version of TemplateURLService::GetDefaultSear… 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:

Index: components/search_engines/template_url_service.cc

diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc

index f4e7a85a2f3b1f32b92bb22dc90b30ec64c47974..51cdb936e6848e9e01f56b1a34a605104f8760b0 100644

--- a/components/search_engines/template_url_service.cc

+++ b/components/search_engines/template_url_service.cc

@@ -604,11 +604,6 @@ void TemplateURLService::SetUserSelectedDefaultSearchProvider(

}

-TemplateURL* TemplateURLService::GetDefaultSearchProvider() {

- return const_cast<TemplateURL*>(

- static_cast<const TemplateURLService*>(this)->GetDefaultSearchProvider());

const TemplateURL* TemplateURLService::GetDefaultSearchProvider() const {

return loaded_ ? default_search_provider_

: initial_default_search_provider_.get();