chrome/browser/search/instant_service.cc - Issue 1092873002: [Icons NTP] Refactor large_icon_source to extract the logic shared between desktop and Android to f…

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 1092873002: [Icons NTP] Refactor large_icon_source to extract the logic shared between desktop and Android to f… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 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

« chrome/browser/favicon/large_icon_service_factory.cc ('K') | « chrome/browser/favicon/large_icon_service_factory.cc ('k') | chrome/browser/ui/webui/large_icon_source.h » ('j') | chrome/browser/ui/webui/large_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 bf75e9a5c75ce7f1de4659b1f5c70591590a9107..c75e9272fd0097816e6c5c6557f53d71e2c3a920 100644

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

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

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

#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/favicon/fallback_icon_service_factory.h"

#include "chrome/browser/favicon/favicon_service_factory.h"

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

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

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

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

@@ -26,6 +27,7 @@

#include "chrome/common/render_messages.h"

#include "components/favicon/core/fallback_icon_service.h"

#include "components/favicon/core/favicon_service.h"

+#include "components/favicon/core/large_icon_service.h"

#include "components/history/core/browser/top_sites.h"

#include "components/keyed_service/core/service_access_type.h"

#include "components/search_engines/template_url_service.h"

@@ -123,9 +125,11 @@ InstantService::InstantService(Profile* profile)

ServiceAccessType::EXPLICIT_ACCESS);

favicon::FallbackIconService* fallback_icon_service =

FallbackIconServiceFactory::GetForBrowserContext(profile_);

+ favicon::LargeIconService* large_icon_service =

+ LargeIconServiceFactory::GetForBrowserContext(profile_);

- content::URLDataSource::Add(profile_,

- new LargeIconSource(favicon_service, fallback_icon_service));

+ content::URLDataSource::Add(profile_, new LargeIconSource(

huangs 2015/04/20 19:50:25 NIT: inconsistent ordering; move this after Favico

beaudoin 2015/04/21 00:15:38 Done.

+ favicon_service, fallback_icon_service, large_icon_service));

content::URLDataSource::Add(

profile_, new FallbackIconSource(fallback_icon_service));

content::URLDataSource::Add(