chrome/browser/search/instant_service.cc - Issue 996253002: [Fallback Icons] Refactor FallbackIconService to be a BrowserContext-level singleton

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/search/instant_service.cc

Issue 996253002: [Fallback Icons] Refactor FallbackIconService to be a BrowserContext-level singleton (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and reverting small unneeded change. Created 5 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

« chrome/browser/favicon/fallback_icon_service_factory.cc ('K') | « chrome/browser/favicon/fallback_icon_service_factory.cc ('k') | chrome/browser/ui/webui/fallback_icon_source.h » ('j') | chrome/browser/ui/webui/fallback_icon_source.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search/instant_service.cc

diff --git a/chrome/browser/search/instant_service.cc b/chrome/browser/search/instant_service.cc

index e785e0c04a061e5c565cc9d9f2119ad21c4a0399..decbe0226052f95027b44c8f33cbb246b0792058 100644

--- a/chrome/browser/search/instant_service.cc

+++ b/chrome/browser/search/instant_service.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/search/instant_service.h"

#include "chrome/browser/chrome_notification_types.h"

+#include "chrome/browser/favicon/chrome_fallback_icon_client_factory.h"

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

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/search/instant_io_context.h"

@@ -125,7 +126,9 @@ InstantService::InstantService(Profile* profile)

content::URLDataSource::Add(profile_, new ThumbnailListSource(profile_));

#endif // !defined(OS_ANDROID)

- content::URLDataSource::Add(profile_, new FallbackIconSource());

+ content::URLDataSource::Add(profile_,

+ new FallbackIconSource(

+ ChromeFallbackIconClientFactory::GetForProfile(profile_)));

sdefresne 2015/03/16 09:11:29 FallbackIconSource only call the FallbackIconClien

huangs 2015/03/16 22:06:11 Done.

content::URLDataSource::Add(

profile_, new FaviconSource(profile_, FaviconSource::FAVICON));

content::URLDataSource::Add(profile_, new MostVisitedIframeSource());