chrome/browser/importer/profile_writer.cc - Issue 375613002: Bypass the favicon_service when importing favicons.

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 375613002: Bypass the favicon_service when importing favicons. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 5 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 eb02768c21e850cf2591cba9e13ecc720c6c845b..c34281c12ae774a9a850f83bed1dc735d4a7f30f 100644

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

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

@@ -226,8 +226,10 @@ void ProfileWriter::AddBookmarks(

void ProfileWriter::AddFavicons(

const std::vector<ImportedFaviconUsage>& favicons) {

- FaviconServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS)->

- SetImportedFavicons(favicons);

+ HistoryService* history_service =

+ HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);

+ if (history_service)

+ history_service->SetImportedFavicons(favicons);

}

typedef std::map<std::string, TemplateURL*> HostPathMap;