chrome/browser/search_engines/default_search_manager.cc - Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data.

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/search_engines/default_search_manager.cc

Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Final review nits. 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

« no previous file with comments | « chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc ('k') | chrome/browser/search_engines/default_search_pref_migration.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/default_search_manager.cc

diff --git a/chrome/browser/search_engines/default_search_manager.cc b/chrome/browser/search_engines/default_search_manager.cc

index 9d344ee47801b25d179d98acaf1acbeb3f802d8a..fefe7b45de2b7d3b577be54e056290c2d2b04ceb 100644

--- a/chrome/browser/search_engines/default_search_manager.cc

+++ b/chrome/browser/search_engines/default_search_manager.cc

@@ -128,7 +128,8 @@ TemplateURLData* DefaultSearchManager::GetDefaultSearchEngine(

if (source)

*source = FROM_FALLBACK;

- return fallback_default_search_.get();

+ return TemplateURLService::fallback_search_engines_disabled() ?

+ NULL : fallback_default_search_.get();

}

DefaultSearchManager::Source