chrome/browser/ui/search_engines/search_engine_tab_helper.cc - Issue 10021008: Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us…

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

Issue 10021008: Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

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

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

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

--- chrome/browser/ui/search_engines/search_engine_tab_helper.cc (revision 131175)

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

@@ -171,11 +171,10 @@

url_service->Remove(current_url);

}

- TemplateURL* new_url = new TemplateURL();

- new_url->set_short_name(keyword);

- new_url->set_keyword(keyword);

- new_url->set_safe_for_autoreplace(true);

- new_url->add_input_encoding(params.searchable_form_encoding);

+ TemplateURLData data;

+ data.short_name = keyword;

+ data.SetKeyword(keyword);

+ data.SetURL(url.spec());

DCHECK(controller.GetLastCommittedEntry());

const GURL& current_favicon =

controller.GetLastCommittedEntry()->GetFavicon().url;

@@ -184,9 +183,9 @@

// latter.

// TODO(sky): Need a way to set the favicon that doesn't involve generating

// its url.

- const GURL& favicon_url = current_favicon.is_valid() ?

+ data.favicon_url = current_favicon.is_valid() ?

current_favicon : TemplateURL::GenerateFaviconURL(params.referrer.url);

- new_url->SetURL(url.spec());

- new_url->set_favicon_url(favicon_url);

- url_service->Add(new_url);

+ data.safe_for_autoreplace = true;

+ data.input_encodings.push_back(params.searchable_form_encoding);

+ url_service->Add(new TemplateURL(data));

}