chrome/browser/ui/webui/options2/search_engine_manager_handler2.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/webui/options2/search_engine_manager_handler2.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

Index: chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc

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

--- chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc (revision 130565)

+++ chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc (working copy)

@@ -196,7 +196,7 @@

index, IDS_SEARCH_ENGINES_EDITOR_DESCRIPTION_COLUMN));

dict->SetString("keyword", table_model->GetText(

index, IDS_SEARCH_ENGINES_EDITOR_KEYWORD_COLUMN));

- dict->SetString("url", template_url->url_ref().DisplayURL());

+ dict->SetString("url", template_url->url()->DisplayURL());

dict->SetBoolean("urlLocked", template_url->prepopulate_id() > 0);

GURL icon_url = template_url->favicon_url();

if (icon_url.is_valid())

Property changes on: chrome/browser/ui/webui/options2/search_engine_manager_handler2.cc

___________________________________________________________________

Deleted: svn:mergeinfo

« no previous file with comments | « chrome/browser/ui/webui/omnibox/omnibox_ui_handler.cc ('k') | chrome/browser/webdata/keyword_table.cc » ('j') | no next file with comments »