| 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/ptr_util.h" |
| 7 #include "base/memory/singleton.h" | 8 #include "base/memory/singleton.h" |
| 8 #include "components/favicon/core/favicon_service.h" | 9 #include "components/favicon/core/favicon_service.h" |
| 9 #include "components/keyed_service/core/service_access_type.h" | 10 #include "components/keyed_service/core/service_access_type.h" |
| 10 #include "components/keyed_service/ios/browser_state_dependency_manager.h" | 11 #include "components/keyed_service/ios/browser_state_dependency_manager.h" |
| 11 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" | 12 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
| 12 #include "ios/chrome/browser/favicon/favicon_client_impl.h" | 13 #include "ios/chrome/browser/favicon/favicon_client_impl.h" |
| 13 #include "ios/chrome/browser/history/history_service_factory.h" | 14 #include "ios/chrome/browser/history/history_service_factory.h" |
| 14 | 15 |
| 15 namespace ios { | 16 namespace ios { |
| 16 | 17 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 40 FaviconServiceFactory::FaviconServiceFactory() | 41 FaviconServiceFactory::FaviconServiceFactory() |
| 41 : BrowserStateKeyedServiceFactory( | 42 : BrowserStateKeyedServiceFactory( |
| 42 "FaviconService", | 43 "FaviconService", |
| 43 BrowserStateDependencyManager::GetInstance()) { | 44 BrowserStateDependencyManager::GetInstance()) { |
| 44 DependsOn(ios::HistoryServiceFactory::GetInstance()); | 45 DependsOn(ios::HistoryServiceFactory::GetInstance()); |
| 45 } | 46 } |
| 46 | 47 |
| 47 FaviconServiceFactory::~FaviconServiceFactory() { | 48 FaviconServiceFactory::~FaviconServiceFactory() { |
| 48 } | 49 } |
| 49 | 50 |
| 50 scoped_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor( | 51 std::unique_ptr<KeyedService> FaviconServiceFactory::BuildServiceInstanceFor( |
| 51 web::BrowserState* context) const { | 52 web::BrowserState* context) const { |
| 52 ios::ChromeBrowserState* browser_state = | 53 ios::ChromeBrowserState* browser_state = |
| 53 ios::ChromeBrowserState::FromBrowserState(context); | 54 ios::ChromeBrowserState::FromBrowserState(context); |
| 54 return make_scoped_ptr(new favicon::FaviconService( | 55 return base::WrapUnique(new favicon::FaviconService( |
| 55 make_scoped_ptr(new FaviconClientImpl(browser_state)), | 56 base::WrapUnique(new FaviconClientImpl(browser_state)), |
| 56 ios::HistoryServiceFactory::GetForBrowserState( | 57 ios::HistoryServiceFactory::GetForBrowserState( |
| 57 browser_state, ServiceAccessType::EXPLICIT_ACCESS))); | 58 browser_state, ServiceAccessType::EXPLICIT_ACCESS))); |
| 58 } | 59 } |
| 59 | 60 |
| 60 } // namespace ios | 61 } // namespace ios |
| OLD | NEW |