chrome/browser/importer/profile_writer.cc - Issue 338363004: Remove Profile* from TemplateURL

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/importer/profile_writer.cc

Issue 338363004: Remove Profile* from TemplateURL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address comments Created 6 years, 6 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:

Index: chrome/browser/importer/profile_writer.cc

diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc

index 3350dfc84964a96bd1bf86fb7f65eab14da8834c..5fa17773a6cabf8bb3db9c56bdcd3c8404430edd 100644

--- a/chrome/browser/importer/profile_writer.cc

+++ b/chrome/browser/importer/profile_writer.cc

@@ -318,7 +318,7 @@ void ProfileWriter::AddKeywords(ScopedVector<TemplateURL> template_urls,

// Only add valid TemplateURLs to the model.

if ((*i)->url_ref().IsValid(model->search_terms_data())) {

- model->AddAndSetProfile(*i, profile_); // Takes ownership.

+ model->Add(*i); // Takes ownership.

*i = NULL; // Prevent the vector from deleting *i later.

}