| 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/ios_chrome_favicon_loader_factory.h" | 5 #include "ios/chrome/browser/favicon/ios_chrome_favicon_loader_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/keyed_service/core/service_access_type.h" | 9 #include "components/keyed_service/core/service_access_type.h" |
| 9 #include "components/keyed_service/ios/browser_state_dependency_manager.h" | 10 #include "components/keyed_service/ios/browser_state_dependency_manager.h" |
| 10 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" | 11 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" |
| 11 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" | 12 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" |
| 12 #import "ios/chrome/browser/favicon/favicon_loader.h" | 13 #import "ios/chrome/browser/favicon/favicon_loader.h" |
| 13 #include "ios/chrome/browser/favicon/favicon_service_factory.h" | 14 #include "ios/chrome/browser/favicon/favicon_service_factory.h" |
| 14 | 15 |
| 15 FaviconLoader* IOSChromeFaviconLoaderFactory::GetForBrowserState( | 16 FaviconLoader* IOSChromeFaviconLoaderFactory::GetForBrowserState( |
| 16 ios::ChromeBrowserState* browser_state) { | 17 ios::ChromeBrowserState* browser_state) { |
| (...skipping 13 matching lines...) Expand all Loading... |
| 30 | 31 |
| 31 IOSChromeFaviconLoaderFactory::IOSChromeFaviconLoaderFactory() | 32 IOSChromeFaviconLoaderFactory::IOSChromeFaviconLoaderFactory() |
| 32 : BrowserStateKeyedServiceFactory( | 33 : BrowserStateKeyedServiceFactory( |
| 33 "FaviconLoader", | 34 "FaviconLoader", |
| 34 BrowserStateDependencyManager::GetInstance()) { | 35 BrowserStateDependencyManager::GetInstance()) { |
| 35 DependsOn(ios::FaviconServiceFactory::GetInstance()); | 36 DependsOn(ios::FaviconServiceFactory::GetInstance()); |
| 36 } | 37 } |
| 37 | 38 |
| 38 IOSChromeFaviconLoaderFactory::~IOSChromeFaviconLoaderFactory() {} | 39 IOSChromeFaviconLoaderFactory::~IOSChromeFaviconLoaderFactory() {} |
| 39 | 40 |
| 40 scoped_ptr<KeyedService> IOSChromeFaviconLoaderFactory::BuildServiceInstanceFor( | 41 std::unique_ptr<KeyedService> |
| 42 IOSChromeFaviconLoaderFactory::BuildServiceInstanceFor( |
| 41 web::BrowserState* context) const { | 43 web::BrowserState* context) const { |
| 42 ios::ChromeBrowserState* browser_state = | 44 ios::ChromeBrowserState* browser_state = |
| 43 ios::ChromeBrowserState::FromBrowserState(context); | 45 ios::ChromeBrowserState::FromBrowserState(context); |
| 44 return make_scoped_ptr( | 46 return base::WrapUnique( |
| 45 new FaviconLoader(ios::FaviconServiceFactory::GetForBrowserState( | 47 new FaviconLoader(ios::FaviconServiceFactory::GetForBrowserState( |
| 46 browser_state, ServiceAccessType::IMPLICIT_ACCESS))); | 48 browser_state, ServiceAccessType::IMPLICIT_ACCESS))); |
| 47 } | 49 } |
| 48 | 50 |
| 49 web::BrowserState* IOSChromeFaviconLoaderFactory::GetBrowserStateToUse( | 51 web::BrowserState* IOSChromeFaviconLoaderFactory::GetBrowserStateToUse( |
| 50 web::BrowserState* context) const { | 52 web::BrowserState* context) const { |
| 51 return GetBrowserStateRedirectedInIncognito(context); | 53 return GetBrowserStateRedirectedInIncognito(context); |
| 52 } | 54 } |
| 53 | 55 |
| 54 bool IOSChromeFaviconLoaderFactory::ServiceIsNULLWhileTesting() const { | 56 bool IOSChromeFaviconLoaderFactory::ServiceIsNULLWhileTesting() const { |
| 55 return true; | 57 return true; |
| 56 } | 58 } |
| OLD | NEW |