OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/favicon/favicon_service_factory.h" | 5 #include "chrome/browser/favicon/favicon_service_factory.h" |
6 | 6 |
7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
8 #include "base/prefs/pref_service.h" | 8 #include "base/prefs/pref_service.h" |
| 9 #include "chrome/browser/favicon/chrome_favicon_client_factory.h" |
9 #include "chrome/browser/favicon/favicon_service.h" | 10 #include "chrome/browser/favicon/favicon_service.h" |
10 #include "chrome/browser/history/history_service.h" | 11 #include "chrome/browser/history/history_service.h" |
11 #include "chrome/browser/history/history_service_factory.h" | 12 #include "chrome/browser/history/history_service_factory.h" |
12 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
13 #include "components/keyed_service/content/browser_context_dependency_manager.h" | 14 #include "components/keyed_service/content/browser_context_dependency_manager.h" |
14 | 15 |
15 // static | 16 // static |
16 FaviconService* FaviconServiceFactory::GetForProfile( | 17 FaviconService* FaviconServiceFactory::GetForProfile( |
17 Profile* profile, Profile::ServiceAccessType sat) { | 18 Profile* profile, Profile::ServiceAccessType sat) { |
18 if (!profile->IsOffTheRecord()) { | 19 if (!profile->IsOffTheRecord()) { |
(...skipping 14 matching lines...) Expand all Loading... |
33 // static | 34 // static |
34 FaviconServiceFactory* FaviconServiceFactory::GetInstance() { | 35 FaviconServiceFactory* FaviconServiceFactory::GetInstance() { |
35 return Singleton<FaviconServiceFactory>::get(); | 36 return Singleton<FaviconServiceFactory>::get(); |
36 } | 37 } |
37 | 38 |
38 FaviconServiceFactory::FaviconServiceFactory() | 39 FaviconServiceFactory::FaviconServiceFactory() |
39 : BrowserContextKeyedServiceFactory( | 40 : BrowserContextKeyedServiceFactory( |
40 "FaviconService", | 41 "FaviconService", |
41 BrowserContextDependencyManager::GetInstance()) { | 42 BrowserContextDependencyManager::GetInstance()) { |
42 DependsOn(HistoryServiceFactory::GetInstance()); | 43 DependsOn(HistoryServiceFactory::GetInstance()); |
| 44 DependsOn(ChromeFaviconClientFactory::GetInstance()); |
43 } | 45 } |
44 | 46 |
45 FaviconServiceFactory::~FaviconServiceFactory() {} | 47 FaviconServiceFactory::~FaviconServiceFactory() {} |
46 | 48 |
47 KeyedService* FaviconServiceFactory::BuildServiceInstanceFor( | 49 KeyedService* FaviconServiceFactory::BuildServiceInstanceFor( |
48 content::BrowserContext* profile) const { | 50 content::BrowserContext* profile) const { |
49 return new FaviconService(static_cast<Profile*>(profile)); | 51 FaviconClient* favicon_client = |
| 52 ChromeFaviconClientFactory::GetForProfile(static_cast<Profile*>(profile)); |
| 53 return new FaviconService(static_cast<Profile*>(profile), favicon_client); |
50 } | 54 } |
51 | 55 |
52 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { | 56 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { |
53 return true; | 57 return true; |
54 } | 58 } |
OLD | NEW |