chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 983043003: Componentize FaviconService and FaviconHandler

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/ui/webui/chrome_web_ui_controller_factory.cc

Issue 983043003: Componentize FaviconService and FaviconHandler (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@favicon_service

Patch Set: Fix android_aosp (reverted the change by mistake by switching computer) 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

« no previous file with comments | « chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h ('k') | chrome/browser/ui/webui/extensions/extension_icon_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

index 4cb13b94c96d07c89435b619f968e8dac6101924..597d766bee1d89ad5b98cc6c4d91e9a3f9535a32 100644

--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

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

#include "chrome/browser/about_flags.h"

#include "chrome/browser/bookmarks/enhanced_bookmarks_features.h"

#include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"

-#include "chrome/browser/favicon/favicon_service.h"

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

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

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

@@ -61,6 +60,7 @@

#include "components/dom_distiller/core/dom_distiller_service.h"

#include "components/dom_distiller/core/url_constants.h"

#include "components/dom_distiller/webui/dom_distiller_ui.h"

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

#include "components/favicon_base/favicon_util.h"

#include "components/favicon_base/select_favicon_frames.h"

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