| 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/favicon_service.h" | 9 #include "chrome/browser/favicon/favicon_service.h" |
| 10 #include "chrome/browser/history/history_service.h" | 10 #include "chrome/browser/history/history_service.h" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 : BrowserContextKeyedServiceFactory( | 39 : BrowserContextKeyedServiceFactory( |
| 40 "FaviconService", | 40 "FaviconService", |
| 41 BrowserContextDependencyManager::GetInstance()) { | 41 BrowserContextDependencyManager::GetInstance()) { |
| 42 DependsOn(HistoryServiceFactory::GetInstance()); | 42 DependsOn(HistoryServiceFactory::GetInstance()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 FaviconServiceFactory::~FaviconServiceFactory() {} | 45 FaviconServiceFactory::~FaviconServiceFactory() {} |
| 46 | 46 |
| 47 BrowserContextKeyedService* FaviconServiceFactory::BuildServiceInstanceFor( | 47 BrowserContextKeyedService* FaviconServiceFactory::BuildServiceInstanceFor( |
| 48 content::BrowserContext* profile) const { | 48 content::BrowserContext* profile) const { |
| 49 HistoryService* history_service = HistoryServiceFactory::GetForProfile( | 49 return new FaviconService(static_cast<Profile*>(profile)); |
| 50 static_cast<Profile*>(profile), Profile::EXPLICIT_ACCESS); | |
| 51 return new FaviconService(history_service); | |
| 52 } | 50 } |
| 53 | 51 |
| 54 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { | 52 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { |
| 55 return true; | 53 return true; |
| 56 } | 54 } |
| OLD | NEW |