chrome/browser/search_engines/template_url.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/template_url.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_engines/default_search_pref_migration_unittest.cc ('K') | « chrome/browser/search_engines/template_url.h ('k') | chrome/browser/search_engines/template_url_service.h » ('j') | chrome/browser/search_engines/template_url_service.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/template_url.cc

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

index 874b4bbaa33bed834f6211b2bcf0b8aac9fc5ff7..e26c429a8f8b17647ad6e1bc9ec8a2c78c8288c4 100644

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

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

@@ -1276,16 +1276,15 @@ void TemplateURL::EncodeSearchTerms(

NOTREACHED();

}

-void TemplateURL::CopyFrom(const TemplateURL& other) {

- if (this == &other)

+void TemplateURL::CopyFrom(const TemplateURLData& other) {

+ if (&data_ == &other)

return;

- profile_ = other.profile_;

- data_ = other.data_;

+ data_ = other;

url_ref_.InvalidateCachedValues();

suggestions_url_ref_.InvalidateCachedValues();

instant_url_ref_.InvalidateCachedValues();

- SetPrepopulateId(other.data_.prepopulate_id);

+ SetPrepopulateId(other.prepopulate_id);

}

void TemplateURL::SetURL(const std::string& url) {