chrome/browser/ui/search_engines/edit_search_engine_controller.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/ui/search_engines/edit_search_engine_controller.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/ui/gtk/edit_search_engine_dialog.cc ('k') | chrome/browser/ui/search_engines/keyword_editor_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/search_engines/edit_search_engine_controller.cc

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

--- chrome/browser/ui/search_engines/edit_search_engine_controller.cc (revision 130565)

+++ chrome/browser/ui/search_engines/edit_search_engine_controller.cc (working copy)

@@ -42,8 +42,7 @@

// TemplateURL owner because |template_url_| might be NULL and we can't call

// TemplateURLRef::IsValid() when its owner is NULL.

TemplateURL t_url;

- t_url.SetURL(url);

- const TemplateURLRef& template_ref = t_url.url_ref();

+ TemplateURLRef template_ref(&t_url, url);

if (!template_ref.IsValid())

return false;

@@ -136,7 +135,7 @@

// we need to replace the search terms before testing for the scheme.

TemplateURL t_url;

t_url.SetURL(url);

- std::string expanded_url(t_url.url_ref().ReplaceSearchTerms(ASCIIToUTF16("x"),

+ std::string expanded_url(t_url.url()->ReplaceSearchTerms(ASCIIToUTF16("x"),

TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));

url_parse::Parsed parts;

std::string scheme(URLFixerUpper::SegmentURL(expanded_url, &parts));