Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4689)

Unified Diff: chrome/browser/ui/webui/browsing_history_handler.cc

Issue 2885523002: Remove non-Android handling in LargeIconSource (Closed)
Patch Set: Merge branch 'master' into searchbox2 Created 3 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/webui/large_icon_source.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/browsing_history_handler.cc
diff --git a/chrome/browser/ui/webui/browsing_history_handler.cc b/chrome/browser/ui/webui/browsing_history_handler.cc
index 3831b517777c1da5e2f3ab8ab268caa772cde748..7a33df54030e5f8b41ea7a01598328a2e0f0c3a3 100644
--- a/chrome/browser/ui/webui/browsing_history_handler.cc
+++ b/chrome/browser/ui/webui/browsing_history_handler.cc
@@ -21,7 +21,6 @@
#include "base/time/time.h"
#include "base/values.h"
#include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/favicon/fallback_icon_service_factory.h"
#include "chrome/browser/favicon/large_icon_service_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
@@ -33,7 +32,6 @@
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/bookmarks/browser/bookmark_utils.h"
#include "components/browser_sync/profile_sync_service.h"
-#include "components/favicon/core/fallback_icon_service.h"
#include "components/favicon/core/fallback_url_util.h"
#include "components/favicon/core/large_icon_service.h"
#include "components/query_parser/snippet.h"
@@ -273,12 +271,9 @@ void BrowsingHistoryHandler::RegisterMessages() {
Profile* profile = Profile::FromWebUI(web_ui());
#if defined(OS_ANDROID)
- favicon::FallbackIconService* fallback_icon_service =
- FallbackIconServiceFactory::GetForBrowserContext(profile);
favicon::LargeIconService* large_icon_service =
LargeIconServiceFactory::GetForBrowserContext(profile);
- content::URLDataSource::Add(
- profile, new LargeIconSource(fallback_icon_service, large_icon_service));
+ content::URLDataSource::Add(profile, new LargeIconSource(large_icon_service));
#else
content::URLDataSource::Add(profile, new FaviconSource(profile));
#endif
« no previous file with comments | « chrome/browser/ui/BUILD.gn ('k') | chrome/browser/ui/webui/large_icon_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698