chrome/browser/search_engines/template_url_model.cc - Issue 5646003: Sanitize PrefStore interface.

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/template_url_model.cc

Issue 5646003: Sanitize PrefStore interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix PrefService mock construction in PrefServiceTest to include command line store. Created 10 years 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: chrome/browser/search_engines/template_url_model.cc

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

index 96fe656ece71b54feb2451d0363c713b47d7b0a1..917e57b1b254f387ba2e7e81b2860f66023e3e1e 100644

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

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

@@ -844,12 +844,12 @@ bool TemplateURLModel::LoadDefaultSearchProviderFromPrefs(

std::vector<std::string> encodings_vector;

base::SplitString(encodings, ';', &encodings_vector);

(*default_provider)->set_input_encodings(encodings_vector);

- if (!id_string.empty()) {

+ if (!id_string.empty() && !*is_managed) {

int64 value;

base::StringToInt64(id_string, &value);

(*default_provider)->set_id(value);

}

- if (!prepopulate_id.empty()) {

+ if (!prepopulate_id.empty() && !*is_managed) {

int value;

base::StringToInt(prepopulate_id, &value);

(*default_provider)->set_prepopulate_id(value);

@@ -1258,4 +1258,3 @@ void TemplateURLModel::NotifyObservers() {

FOR_EACH_OBSERVER(TemplateURLModelObserver, model_observers_,

OnTemplateURLModelChanged());

}