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

Unified Diff: chrome/browser/favicon/large_icon_service_factory.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
« no previous file with comments | « chrome/browser/favicon/large_icon_service_factory.h ('k') | chrome/browser/search/instant_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/favicon/large_icon_service_factory.cc
diff --git a/chrome/browser/favicon/fallback_icon_service_factory.cc b/chrome/browser/favicon/large_icon_service_factory.cc
similarity index 36%
copy from chrome/browser/favicon/fallback_icon_service_factory.cc
copy to chrome/browser/favicon/large_icon_service_factory.cc
index e32f6a1ef1c6204e629675b46126e874fd22c808..56890cb5ffbb65f7848f5eebc07c2c70dba34350 100644
--- a/chrome/browser/favicon/fallback_icon_service_factory.cc
+++ b/chrome/browser/favicon/large_icon_service_factory.cc
@@ -2,42 +2,45 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/favicon/fallback_icon_service_factory.h"
+#include "chrome/browser/favicon/large_icon_service_factory.h"
#include "base/memory/singleton.h"
-#include "chrome/browser/favicon/chrome_fallback_icon_client_factory.h"
-#include "components/favicon/core/fallback_icon_service.h"
+#include "chrome/browser/favicon/favicon_service_factory.h"
+#include "chrome/browser/profiles/profile.h"
+#include "components/favicon/core/favicon_service.h"
+#include "components/favicon/core/large_icon_service.h"
#include "components/keyed_service/content/browser_context_dependency_manager.h"
#include "content/public/browser/browser_context.h"
// static
-favicon::FallbackIconService* FallbackIconServiceFactory::GetForBrowserContext(
+favicon::LargeIconService* LargeIconServiceFactory::GetForBrowserContext(
content::BrowserContext* context) {
- return static_cast<favicon::FallbackIconService*>(
+ return static_cast<favicon::LargeIconService*>(
GetInstance()->GetServiceForBrowserContext(context, true));
}
// static
-FallbackIconServiceFactory* FallbackIconServiceFactory::GetInstance() {
- return Singleton<FallbackIconServiceFactory>::get();
+LargeIconServiceFactory* LargeIconServiceFactory::GetInstance() {
+ return Singleton<LargeIconServiceFactory>::get();
}
-FallbackIconServiceFactory::FallbackIconServiceFactory()
+LargeIconServiceFactory::LargeIconServiceFactory()
: BrowserContextKeyedServiceFactory(
- "FallbackIconService",
+ "LargeIconService",
BrowserContextDependencyManager::GetInstance()) {
- DependsOn(ChromeFallbackIconClientFactory::GetInstance());
+ DependsOn(FaviconServiceFactory::GetInstance());
}
-FallbackIconServiceFactory::~FallbackIconServiceFactory() {}
+LargeIconServiceFactory::~LargeIconServiceFactory() {}
-KeyedService* FallbackIconServiceFactory::BuildServiceInstanceFor(
+KeyedService* LargeIconServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* context) const {
- favicon::FallbackIconClient* fallback_icon_client =
- ChromeFallbackIconClientFactory::GetForBrowserContext(context);
- return new favicon::FallbackIconService(fallback_icon_client);
+ favicon::FaviconService* favicon_service =
+ FaviconServiceFactory::GetForProfile(Profile::FromBrowserContext(context),
+ ServiceAccessType::EXPLICIT_ACCESS);
+ return new favicon::LargeIconService(favicon_service);
}
-bool FallbackIconServiceFactory::ServiceIsNULLWhileTesting() const {
+bool LargeIconServiceFactory::ServiceIsNULLWhileTesting() const {
return true;
}
« no previous file with comments | « chrome/browser/favicon/large_icon_service_factory.h ('k') | chrome/browser/search/instant_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698