ios/chrome/browser/ui/contextual_search/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: ios/chrome/browser/ui/contextual_search/contextual_search_delegate.cc

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

Patch Set: Fix unit test (the model was already loaded) 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 | « ios/chrome/browser/ui/browser_view_controller.mm ('k') | ios/chrome/browser/ui/contextual_search/touch_to_search_permissions_mediator.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ios/chrome/browser/ui/contextual_search/contextual_search_delegate.cc

diff --git a/ios/chrome/browser/ui/contextual_search/contextual_search_delegate.cc b/ios/chrome/browser/ui/contextual_search/contextual_search_delegate.cc

index 93868073a9a5b0405e491b5e51671003338ff9ea..624a0483f6f5083a8885fd80b179b48115119412 100644

--- a/ios/chrome/browser/ui/contextual_search/contextual_search_delegate.cc

+++ b/ios/chrome/browser/ui/contextual_search/contextual_search_delegate.cc

@@ -266,7 +266,8 @@ GURL ContextualSearchDelegate::BuildRequestUrl() {

std::string ContextualSearchDelegate::GetSearchTermResolutionUrlString(

const std::string& selected_text,

const std::string& base_page_url) {

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

+ const TemplateURL* template_url =

+ template_url_service_->GetDefaultSearchProvider();

TemplateURLRef::SearchTermsArgs search_terms_args =

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