chrome/browser/favicon/favicon_service.cc - Issue 407513002: Revert of 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/favicon/favicon_service.cc

Issue 407513002: Revert of 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/favicon/favicon_service.cc

diff --git a/chrome/browser/favicon/favicon_service.cc b/chrome/browser/favicon/favicon_service.cc

index b55bb29fe2bf44e5e2448a3282a504cf0a83e501..a45c6afe181f7f827c210e7665e90eb5392f1860 100644

--- a/chrome/browser/favicon/favicon_service.cc

+++ b/chrome/browser/favicon/favicon_service.cc

@@ -12,6 +12,7 @@

#include "chrome/browser/history/history_service.h"

#include "chrome/browser/history/history_service_factory.h"

#include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h"

+#include "chrome/common/importer/imported_favicon_usage.h"

#include "chrome/common/url_constants.h"

#include "components/favicon_base/favicon_types.h"

#include "components/favicon_base/favicon_util.h"

@@ -283,6 +284,12 @@

history_service_->CloneFavicons(old_page_url, new_page_url);

}

+void FaviconService::SetImportedFavicons(

+ const std::vector<ImportedFaviconUsage>& favicon_usage) {

+ if (history_service_)

+ history_service_->SetImportedFavicons(favicon_usage);

void FaviconService::MergeFavicon(

const GURL& page_url,

const GURL& icon_url,

« no previous file with comments | « chrome/browser/favicon/favicon_service.h ('k') | chrome/browser/history/history_service.h » ('j') | no next file with comments »