| 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;
|
| }
|
|
|