chrome/browser/ui/webui/chrome_web_ui_controller_factory.h - Issue 291643002: Move favicon callbacks to favicon_base

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.h

Issue 291643002: Move favicon callbacks to favicon_base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 7 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/ui/webui/chrome_web_ui_controller_factory.h

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

index 718ca6c92eb11fe98a04df44ce95b939f53b330e..dfd55987c514056e6ad32d4aaaf2278d94250ec2 100644

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

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

@@ -7,9 +7,10 @@

#include "base/basictypes.h"

#include "base/memory/singleton.h"

+#include "components/favicon_base/favicon_callback.h"

#include "content/public/browser/web_ui.h"

#include "content/public/browser/web_ui_controller_factory.h"

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

+#include "ui/base/layout.h"

class Profile;

@@ -36,7 +37,7 @@ class ChromeWebUIControllerFactory : public content::WebUIControllerFactory {

Profile* profile,

const GURL& page_url,

const std::vector<ui::ScaleFactor>& scale_factors,

- const FaviconService::FaviconResultsCallback& callback) const;

+ const favicon_base::FaviconResultsCallback& callback) const;

static ChromeWebUIControllerFactory* GetInstance();