ios/chrome/browser/ui/browser_view_controller.mm - 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/browser_view_controller.mm

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:

Index: ios/chrome/browser/ui/browser_view_controller.mm

diff --git a/ios/chrome/browser/ui/browser_view_controller.mm b/ios/chrome/browser/ui/browser_view_controller.mm

index 0f622e410015f4fb09f9aaefd66ceb7c2a65f59d..d03e1c198b3185d261c571a28841072ef3e5d1eb 100644

--- a/ios/chrome/browser/ui/browser_view_controller.mm

+++ b/ios/chrome/browser/ui/browser_view_controller.mm

@@ -2625,7 +2625,7 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {

TemplateURLService* service =

ios::TemplateURLServiceFactory::GetForBrowserState(_browserState);

- TemplateURL* defaultURL = service->GetDefaultSearchProvider();

+ const TemplateURL* defaultURL = service->GetDefaultSearchProvider();

if (defaultURL && !defaultURL->image_url().empty() &&

defaultURL->image_url_ref().IsValid(service->search_terms_data())) {

title = l10n_util::GetNSStringF(IDS_IOS_CONTEXT_MENU_SEARCHWEBFORIMAGE,

@@ -3190,7 +3190,8 @@ class BrowserBookmarkModelBridge : public bookmarks::BookmarkModelObserver {

TemplateURLService* templateUrlService =

ios::TemplateURLServiceFactory::GetForBrowserState(_browserState);

- TemplateURL* defaultURL = templateUrlService->GetDefaultSearchProvider();

+ const TemplateURL* defaultURL =

+ templateUrlService->GetDefaultSearchProvider();

DCHECK(!defaultURL->image_url().empty());

DCHECK(defaultURL->image_url_ref().IsValid(

templateUrlService->search_terms_data()));