chrome/browser/protector/default_search_provider_change.cc - Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak…

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/protector/default_search_provider_change.cc

Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 9 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/policy/configuration_policy_handler.cc ('k') | chrome/browser/protector/default_search_provider_change_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/protector/default_search_provider_change.cc

===================================================================

--- chrome/browser/protector/default_search_provider_change.cc (revision 130565)

+++ chrome/browser/protector/default_search_provider_change.cc (working copy)

@@ -54,11 +54,13 @@

return false;

return url->short_name() == other_->short_name() &&

AreKeywordsSame(url, other_) &&

- url->url() == other_->url() &&

- url->suggestions_url() == other_->suggestions_url() &&

- url->instant_url() == other_->instant_url() &&

+ TemplateURLRef::SameUrlRefs(url->url(), other_->url()) &&

+ TemplateURLRef::SameUrlRefs(url->suggestions_url(),

+ other_->suggestions_url()) &&

+ TemplateURLRef::SameUrlRefs(url->instant_url(),

+ other_->instant_url()) &&

+ url->favicon_url() == other_->favicon_url() &&

url->safe_for_autoreplace() == other_->safe_for_autoreplace() &&

- url->favicon_url() == other_->favicon_url() &&

url->show_in_default_list() == other_->show_in_default_list() &&

url->input_encodings() == other_->input_encodings() &&

url->prepopulate_id() == other_->prepopulate_id();