chrome/browser/extensions/settings_api_helpers.cc - Issue 312943002: Remove unused param from search engine extension override helper function.

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/extensions/settings_api_helpers.cc

Issue 312943002: Remove unused param from search engine extension override helper function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 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

« chrome/browser/extensions/settings_api_helpers.h ('K') | « chrome/browser/extensions/settings_api_helpers.h ('k') | chrome/browser/ui/views/settings_api_bubble_helper_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/settings_api_helpers.cc

diff --git a/chrome/browser/extensions/settings_api_helpers.cc b/chrome/browser/extensions/settings_api_helpers.cc

index 839098cbd4b0814000c3a36dc0a7a9ef4bb98871..81f03b3e7ad960253e23b38144de2c79ca2c127b 100644

--- a/chrome/browser/extensions/settings_api_helpers.cc

+++ b/chrome/browser/extensions/settings_api_helpers.cc

@@ -88,15 +88,10 @@ const Extension* OverridesStartupPages(content::BrowserContext* browser_context,

}

const Extension* OverridesSearchEngine(

- content::BrowserContext* browser_context,

- api::manifest_types::ChromeSettingsOverrides::Search_provider*

- search_provider) {

+ content::BrowserContext* browser_context) {

const extensions::Extension* extension = NULL;

- const extensions::SettingsOverrides* settings =

- FindOverridingExtension(

- browser_context, BUBBLE_TYPE_SEARCH_ENGINE, &extension);

- if (settings && search_provider)

- search_provider = settings->search_engine.get();

+ FindOverridingExtension(

+ browser_context, BUBBLE_TYPE_SEARCH_ENGINE, &extension);

return extension;

}