chrome/browser/ui/android/navigation_popup.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/android/navigation_popup.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/sync/test/integration/bookmarks_helper.cc ('k') | chrome/browser/ui/app_list/search/suggestions/suggestions_search_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/navigation_popup.cc

diff --git a/chrome/browser/ui/android/navigation_popup.cc b/chrome/browser/ui/android/navigation_popup.cc

index d23655ab23d8adeddc48c61c6adbd00941d90255..f7369c53e5477fcc20a7ee4fed48296bb121e599 100644

--- a/chrome/browser/ui/android/navigation_popup.cc

+++ b/chrome/browser/ui/android/navigation_popup.cc

@@ -8,11 +8,11 @@

#include "base/android/scoped_java_ref.h"

#include "base/bind.h"

#include "chrome/browser/browser_process.h"

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

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

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

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

#include "chrome/common/url_constants.h"

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

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

#include "jni/NavigationPopup_jni.h"

#include "third_party/skia/include/core/SkBitmap.h"