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: Fix merge errors. 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/search/instant_service.cc ('K') | « chrome/browser/search/instant_service.cc ('k') | chrome/browser/search_engines/default_search_policy_handler.cc » ('j') | chrome/browser/search_engines/default_search_pref_migration.cc » ('J')
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 42deedcfefdab5f4ed98763f9a7f3729b597bcdf..2cb52e8625f502b2ea2b3baacdee7b17fdb3abf8 100644

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

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

@@ -99,7 +99,7 @@ void DefaultSearchManager::RegisterProfilePrefs(

user_prefs::PrefRegistrySyncable* registry) {

registry->RegisterDictionaryPref(

kDefaultSearchProviderDataPrefName,

- user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);

gab 2014/05/07 20:25:09 Once again, wrong upstream for upload? This isn't

+ user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);

}

// static

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

if (source)

*source = FROM_FALLBACK;

- return fallback_default_search_.get();

+ return TemplateURLService::FallbackSearchEnginesDisabled()

+ ? NULL

+ : fallback_default_search_.get();

}

DefaultSearchManager::Source