OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "ios/chrome/browser/favicon/favicon_service_factory.h" | 5 #include "ios/chrome/browser/favicon/favicon_service_factory.h" |
6 | 6 |
7 #include "base/memory/singleton.h" | 7 #include "base/memory/singleton.h" |
8 #include "components/favicon/core/favicon_service.h" | 8 #include "components/favicon/core/favicon_service.h" |
9 #include "components/keyed_service/core/service_access_type.h" | 9 #include "components/keyed_service/core/service_access_type.h" |
10 #include "components/keyed_service/ios/browser_state_dependency_manager.h" | 10 #include "components/keyed_service/ios/browser_state_dependency_manager.h" |
(...skipping 16 matching lines...) Expand all Loading... |
27 browser_state->GetOriginalChromeBrowserState(), true)); | 27 browser_state->GetOriginalChromeBrowserState(), true)); |
28 } | 28 } |
29 | 29 |
30 // ios::ChromeBrowserState is OffTheRecord without access. | 30 // ios::ChromeBrowserState is OffTheRecord without access. |
31 NOTREACHED() << "ChromeBrowserState is OffTheRecord"; | 31 NOTREACHED() << "ChromeBrowserState is OffTheRecord"; |
32 return nullptr; | 32 return nullptr; |
33 } | 33 } |
34 | 34 |
35 // static | 35 // static |
36 FaviconServiceFactory* FaviconServiceFactory::GetInstance() { | 36 FaviconServiceFactory* FaviconServiceFactory::GetInstance() { |
37 return Singleton<FaviconServiceFactory>::get(); | 37 return base::Singleton<FaviconServiceFactory>::get(); |
38 } | 38 } |
39 | 39 |
40 FaviconServiceFactory::FaviconServiceFactory() | 40 FaviconServiceFactory::FaviconServiceFactory() |
41 : BrowserStateKeyedServiceFactory( | 41 : BrowserStateKeyedServiceFactory( |
42 "FaviconService", | 42 "FaviconService", |
43 BrowserStateDependencyManager::GetInstance()) { | 43 BrowserStateDependencyManager::GetInstance()) { |
44 DependsOn(ios::HistoryServiceFactory::GetInstance()); | 44 DependsOn(ios::HistoryServiceFactory::GetInstance()); |
45 } | 45 } |
46 | 46 |
47 FaviconServiceFactory::~FaviconServiceFactory() { | 47 FaviconServiceFactory::~FaviconServiceFactory() { |
48 } | 48 } |
49 | 49 |
50 scoped_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor( | 50 scoped_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor( |
51 web::BrowserState* context) const { | 51 web::BrowserState* context) const { |
52 ios::ChromeBrowserState* browser_state = | 52 ios::ChromeBrowserState* browser_state = |
53 ios::ChromeBrowserState::FromBrowserState(context); | 53 ios::ChromeBrowserState::FromBrowserState(context); |
54 return make_scoped_ptr(new favicon::FaviconService( | 54 return make_scoped_ptr(new favicon::FaviconService( |
55 make_scoped_ptr(new FaviconClientImpl), | 55 make_scoped_ptr(new FaviconClientImpl), |
56 ios::HistoryServiceFactory::GetForBrowserState( | 56 ios::HistoryServiceFactory::GetForBrowserState( |
57 browser_state, ServiceAccessType::EXPLICIT_ACCESS))); | 57 browser_state, ServiceAccessType::EXPLICIT_ACCESS))); |
58 } | 58 } |
59 | 59 |
60 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { | 60 bool FaviconServiceFactory::ServiceIsNULLWhileTesting() const { |
61 return true; | 61 return true; |
62 } | 62 } |
63 | 63 |
64 } // namespace ios | 64 } // namespace ios |
OLD | NEW |